Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
//------------------------------------------------------------------------------
// <auto-generated>
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by GitVersion.
//
//
// You can modify this code as we will not overwrite it when re-executing GitVersion
// </auto-generated>
// </auto-generated>
//------------------------------------------------------------------------------

using System.Reflection;

[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyInformationalVersion("1.0.0")]
[assembly: AssemblyInformationalVersion("1.0.0")]
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
//------------------------------------------------------------------------------
// <auto-generated>
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by GitVersion.
//
//
// You can modify this code as we will not overwrite it when re-executing GitVersion
// </auto-generated>
// </auto-generated>
//------------------------------------------------------------------------------

using System.Reflection;

[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyInformationalVersion("1.0.0")]
[assembly: AssemblyInformationalVersion("1.0.0")]
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
//------------------------------------------------------------------------------
// <auto-generated>
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by GitVersion.
//
//
// You can modify this code as we will not overwrite it when re-executing GitVersion
// </auto-generated>
// </auto-generated>
//------------------------------------------------------------------------------

using System.Reflection;

[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyInformationalVersion("1.0.0")]
[assembly: AssemblyInformationalVersion("1.0.0")]
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by GitVersion.
//
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by GitVersion.
//
// You can modify this code as we will not overwrite it when re-executing GitVersion
// </auto-generated>
// </auto-generated>
//------------------------------------------------------------------------------
namespace GitVersionAssemblyInfoFile

Expand All @@ -12,4 +12,4 @@ open System.Reflection
[<assembly: AssemblyFileVersion("1.0.0.0")>]
[<assembly: AssemblyVersion("1.0.0.0")>]
[<assembly: AssemblyInformationalVersion("1.0.0")>]
()
()
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by GitVersion.
//
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by GitVersion.
//
// You can modify this code as we will not overwrite it when re-executing GitVersion
// </auto-generated>
// </auto-generated>
//------------------------------------------------------------------------------
namespace GitVersionAssemblyInfoFile

Expand All @@ -12,4 +12,4 @@ open System.Reflection
[<assembly: AssemblyFileVersion("1.0.0.0")>]
[<assembly: AssemblyVersion("1.0.0.0")>]
[<assembly: AssemblyInformationalVersion("1.0.0")>]
()
()
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by GitVersion.
//
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by GitVersion.
//
// You can modify this code as we will not overwrite it when re-executing GitVersion
// </auto-generated>
// </auto-generated>
//------------------------------------------------------------------------------
namespace GitVersionAssemblyInfoFile

Expand All @@ -12,4 +12,4 @@ open System.Reflection
[<assembly: AssemblyFileVersion("1.0.0.0")>]
[<assembly: AssemblyVersion("1.0.0.0")>]
[<assembly: AssemblyInformationalVersion("1.0.0")>]
()
()
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ module GitVersionInformation
let VersionSourceSha = "versionSourceSha"
let CommitsSinceVersionSource = "5"
let CommitsSinceVersionSourcePadded = "0005"
let CommitDate = "2014-03-06"
let CommitDate = "2014-03-06"
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
''------------------------------------------------------------------------------
'' <auto-generated>
'' This code was generated by GitVersion.
''
''------------------------------------------------------------------------------
'' <auto-generated>
'' This code was generated by GitVersion.
''
'' You can modify this code as we will not overwrite it when re-executing GitVersion
'' </auto-generated>
'' </auto-generated>
''------------------------------------------------------------------------------

Imports System.Reflection

<Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: AssemblyVersion("1.0.0.0")>
<Assembly: AssemblyInformationalVersion("1.0.0")>
<Assembly: AssemblyInformationalVersion("1.0.0")>
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
''------------------------------------------------------------------------------
'' <auto-generated>
'' This code was generated by GitVersion.
''
''------------------------------------------------------------------------------
'' <auto-generated>
'' This code was generated by GitVersion.
''
'' You can modify this code as we will not overwrite it when re-executing GitVersion
'' </auto-generated>
'' </auto-generated>
''------------------------------------------------------------------------------

Imports System.Reflection

<Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: AssemblyVersion("1.0.0.0")>
<Assembly: AssemblyInformationalVersion("1.0.0")>
<Assembly: AssemblyInformationalVersion("1.0.0")>
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
''------------------------------------------------------------------------------
'' <auto-generated>
'' This code was generated by GitVersion.
''
''------------------------------------------------------------------------------
'' <auto-generated>
'' This code was generated by GitVersion.
''
'' You can modify this code as we will not overwrite it when re-executing GitVersion
'' </auto-generated>
'' </auto-generated>
''------------------------------------------------------------------------------

Imports System.Reflection

<Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: AssemblyVersion("1.0.0.0")>
<Assembly: AssemblyInformationalVersion("1.0.0")>
<Assembly: AssemblyInformationalVersion("1.0.0")>
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ NotInheritable Class GitVersionInformation
Public Shared CommitsSinceVersionSource As String = "5"
Public Shared CommitsSinceVersionSourcePadded As String = "0005"
Public Shared CommitDate As String = "2014-03-06"
End Class
End Class
6 changes: 3 additions & 3 deletions src/GitVersionCore.Tests/AssemblyFileVersionTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public void ValidateAssemblyFileVersionBuilder(AssemblyFileVersioningScheme asse
int tag, string versionString)
{
var semVer = new SemanticVersion(major, minor, patch)
{
PreReleaseTag = new SemanticVersionPreReleaseTag("Test", tag)
};
{
PreReleaseTag = new SemanticVersionPreReleaseTag("Test", tag)
};

var assemblyFileVersion = semVer.GetAssemblyFileVersion(assemblyFileVersioningScheme);

Expand Down
4 changes: 2 additions & 2 deletions src/GitVersionCore.Tests/AssemblyParallelizable.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
using NUnit.Framework;
using NUnit.Framework;

[assembly: Parallelizable(ParallelScope.Fixtures)]
[assembly: Parallelizable(ParallelScope.Fixtures)]
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
namespace GitVersionCore.Tests.BuildServers
{
[TestFixture]
public class BuildServerBaseTests : TestBase
public class BuildServerBaseTests : TestBase
{
private IVariableProvider buildServer;
private IServiceProvider sp;
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionCore.Tests/BuildServers/EnvRunTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void GenerateSetVersionMessage(string fullSemVer)
version.ShouldBe(fullSemVer);
}

[TestCase("Version", "1.2.3", "@@envrun[set name='GitVersion_Version' value='1.2.3']")]
[TestCase("Version", "1.2.3", "@@envrun[set name='GitVersion_Version' value='1.2.3']")]
[TestCase("Version", "1.2.3-rc4", "@@envrun[set name='GitVersion_Version' value='1.2.3-rc4']")]
public void GenerateSetParameterMessage(string name, string value, string expected)
{
Expand Down
4 changes: 2 additions & 2 deletions src/GitVersionCore.Tests/BuildServers/JenkinsTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ public void CanApplyCurrentContextWhenenvironmentVariableIsSet()
SetEnvironmentVariableForDetection();
buildServer.CanApplyToCurrentContext().ShouldBe(true);
}

[Test]
public void CanNotApplyCurrentContextWhenenvironmentVariableIsNotSet()
{
ClearenvironmentVariableForDetection();
buildServer.CanApplyToCurrentContext().ShouldBe(false);
buildServer.CanApplyToCurrentContext().ShouldBe(false);
}

[Test]
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionCore.Tests/BuildServers/TeamCityTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public void SetUp()
});
buildServer = sp.GetService<TeamCity>();
}

[Test]
public void DevelopBranch()
{
Expand Down
6 changes: 3 additions & 3 deletions src/GitVersionCore.Tests/DefaultConfigFileLocatorTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public void Setup()

ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
}

[TestCase(DefaultRepoPath)]
[TestCase(DefaultWorkingPath)]
public void WarnOnExistingGitVersionConfigYamlFile(string path)
Expand Down Expand Up @@ -100,12 +100,12 @@ public void NoWarnOnGitVersionYmlFile()

var output = WithDefaultConfigFileLocator(configFileLocator =>
{
configurationProvider.Provide(repoPath);
configurationProvider.Provide(repoPath);
});

output.Length.ShouldBe(0);
}

[Test]
public void WarnOnObsoleteIsDevelopBranchConfigurationSetting()
{
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionCore.Tests/DocumentationTests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.IO;
using System.Linq;
using System.Reflection;
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionCore.Tests/DynamicRepositoryTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void FindsVersionInDynamicRepo(string name, string url, string targetBran
services.AddSingleton(options);
});


var gitVersionCalculator = sp.GetService<IGitVersionCalculator>();

var versionVariables = gitVersionCalculator.CalculateVersionVariables();
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionCore.Tests/GitRepoMetadataProviderTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ public void FindsCorrectMergeBaseForMultipleForwardMerges()

var develop = fixture.Repository.FindBranch("develop");
var release = fixture.Repository.FindBranch("release-2.0.0");

var releaseBranchMergeBase = new GitRepoMetadataProvider(fixture.Repository, log, configuration)
.FindMergeBase(release, develop);

Expand Down
4 changes: 2 additions & 2 deletions src/GitVersionCore.Tests/GitToolsTestingExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public static void InitializeRepo(this RemoteRepositoryFixture fixture)

var serviceProvider = ConfigureService(services =>
{
services.AddSingleton(options);
services.AddSingleton(options);
});

var gitPreparer = serviceProvider.GetService<IGitPreparer>();
Expand All @@ -100,7 +100,7 @@ private static IServiceProvider ConfigureService(Action<IServiceCollection> serv
.AddModule(new GitVersionCoreTestModule());

servicesOverrides?.Invoke(services);
return services.BuildServiceProvider();
return services.BuildServiceProvider();
}
}
}
2 changes: 1 addition & 1 deletion src/GitVersionCore.Tests/GitVersionContextBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public GitVersionContextBuilder WithTaggedMaster()
{
repository = CreateRepository();
var target = repository.Head.Tip;
((MockTagCollection)repository.Tags).Add(new MockTag ("1.0.0", target));
((MockTagCollection)repository.Tags).Add(new MockTag("1.0.0", target));
return this;
}

Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionCore.Tests/Helpers/DirectoryHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@ public static void DeleteDirectory(string directoryPath)
}
}
}
}
}
4 changes: 2 additions & 2 deletions src/GitVersionCore.Tests/Helpers/PathHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ public static string GetExecutable()
#if NETFRAMEWORK
var executable = Path.Combine(GetExeDirectory(), "GitVersion.exe");
#else
var executable = "dotnet";
var executable = "dotnet";
#endif
return executable;
}

public static string GetExecutableArgs(string args)
{
#if !NETFRAMEWORK
args = $"{Path.Combine(GetExeDirectory(), "GitVersion.dll")} {args}";
args = $"{Path.Combine(GetExeDirectory(), "GitVersion.dll")} {args}";
#endif
return args;
}
Expand Down
22 changes: 11 additions & 11 deletions src/GitVersionCore.Tests/Helpers/TestableVersionVariables.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ namespace GitVersionCore.Tests.Helpers
internal class TestableVersionVariables : VersionVariables
{
public TestableVersionVariables(
string major = "", string minor = "", string patch = "", string buildMetaData = "",
string buildMetaDataPadded = "", string fullBuildMetaData = "", string branchName = "",
string sha = "", string shortSha = "", string majorMinorPatch = "", string semVer = "",
string legacySemVer = "", string legacySemVerPadded = "", string fullSemVer = "",
string assemblySemVer = "", string assemblySemFileVer = "", string preReleaseTag = "",
string major = "", string minor = "", string patch = "", string buildMetaData = "",
string buildMetaDataPadded = "", string fullBuildMetaData = "", string branchName = "",
string sha = "", string shortSha = "", string majorMinorPatch = "", string semVer = "",
string legacySemVer = "", string legacySemVerPadded = "", string fullSemVer = "",
string assemblySemVer = "", string assemblySemFileVer = "", string preReleaseTag = "",
string preReleaseTagWithDash = "", string preReleaseLabel = "", string preReleaseNumber = "",
string weightedPreReleaseNumber = "", string informationalVersion = "", string commitDate = "",
string nugetVersion = "", string nugetVersionV2 = "", string nugetPreReleaseTag = "",
string weightedPreReleaseNumber = "", string informationalVersion = "", string commitDate = "",
string nugetVersion = "", string nugetVersionV2 = "", string nugetPreReleaseTag = "",
string nugetPreReleaseTagV2 = "", string versionSourceSha = "", string commitsSinceVersionSource = "",
string commitsSinceVersionSourcePadded = "") : base(
major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName,
sha, shortSha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer,
assemblySemVer, assemblySemFileVer, preReleaseTag, weightedPreReleaseNumber, preReleaseTagWithDash,
preReleaseLabel, preReleaseNumber, informationalVersion, commitDate, nugetVersion, nugetVersionV2,
major, minor, patch, buildMetaData, buildMetaDataPadded, fullBuildMetaData, branchName,
sha, shortSha, majorMinorPatch, semVer, legacySemVer, legacySemVerPadded, fullSemVer,
assemblySemVer, assemblySemFileVer, preReleaseTag, weightedPreReleaseNumber, preReleaseTagWithDash,
preReleaseLabel, preReleaseNumber, informationalVersion, commitDate, nugetVersion, nugetVersionV2,
nugetPreReleaseTag, nugetPreReleaseTagV2, versionSourceSha, commitsSinceVersionSource, commitsSinceVersionSourcePadded)
{
}
Expand Down
Loading