Skip to content

Commit ebc7419

Browse files
ruhullahshahruhullahshah
authored
Merge branch 'master' into feature/1994_PreReleaseWeightAndRegexForTags
2 parents b192e17 + c6d8764 commit ebc7419

File tree

166 files changed

+2586
-1370
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+2586
-1370
lines changed

‎.github/workflows/build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ on:
1616

1717
env:
1818
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2
19-
MSBUILDSINGLELOADCONTEXT: 1
2019
ENABLED_MULTI_STAGE_BUILD: true
2120
ENABLED_UNIT_TESTS: true
2221
ENABLED_PUBLISH_DOCKER: true

‎azure-pipelines.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ pr:
1212
variables:
1313
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 'true'
1414
DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
15-
MSBUILDSINGLELOADCONTEXT: 1
1615

1716
stages:
1817
- stage: Build

‎build.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/usr/bin/env bash
2-
DOTNET_VERSION=2.1.804,3.1.201
2+
DOTNET_VERSION=2.1.805,3.1.201

‎build/pack.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Task("Pack-Prepare")
1717
});
1818
}
1919

20-
var sourceDir = parameters.Paths.Directories.Native.Combine(PlatformFamily.Windows.ToString());
20+
var sourceDir = parameters.Paths.Directories.Native.Combine(PlatformFamily.Windows.ToString()).Combine("win-x64");
2121
var sourceFiles = GetFiles(sourceDir + "/*.*");
2222

2323
// Cmdline and Portable

‎build/utils/docker.cake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,15 +126,13 @@ DockerContainerRunSettings GetDockerRunSettings(BuildParameters parameters)
126126
settings.Env = new[]
127127
{
128128
"TF_BUILD=true",
129-
"MSBUILDSINGLELOADCONTEXT=1",
130129
$"BUILD_SOURCEBRANCH={Context.EnvironmentVariable("BUILD_SOURCEBRANCH")}"
131130
};
132131
}
133132
if (parameters.IsRunningOnGitHubActions) {
134133
settings.Env = new[]
135134
{
136135
"GITHUB_ACTIONS=true",
137-
"MSBUILDSINGLELOADCONTEXT=1",
138136
$"GITHUB_REF={Context.EnvironmentVariable("GITHUB_REF")}"
139137
};
140138
}

‎codecov.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,10 @@ coverage:
22
range: 50..70
33
round: down
44
precision: 2
5+
status:
6+
patch:
7+
default:
8+
# basic
9+
target: auto
10+
threshold: 1%
11+
base: auto

‎src/Directory.Build.props

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,18 @@
1717

1818
</PropertyGroup>
1919
<PropertyGroup>
20-
<PackageVersion_LibGit2Sharp>0.26.2</PackageVersion_LibGit2Sharp>
21-
<PackageVersion_LibGit2Sharp_NativeBinaries>2.0.306</PackageVersion_LibGit2Sharp_NativeBinaries>
22-
<PackageVersion_JetBrainsAnnotations>2019.1.3</PackageVersion_JetBrainsAnnotations>
23-
<PackageVersion_YamlDotNet>8.1.0</PackageVersion_YamlDotNet>
20+
<PackageVersion_LibGit2Sharp>0.27.0-preview-0034</PackageVersion_LibGit2Sharp>
21+
<PackageVersion_LibGit2Sharp_NativeBinaries>2.0.298</PackageVersion_LibGit2Sharp_NativeBinaries>
22+
23+
<PackageVersion_JetBrainsAnnotations>2020.1.0</PackageVersion_JetBrainsAnnotations>
24+
<PackageVersion_YamlDotNet>8.1.1</PackageVersion_YamlDotNet>
2425
<PackageVersion_NewtonsoftJson>12.0.3</PackageVersion_NewtonsoftJson>
2526
<PackageVersion_MicrosoftExtensions>3.0.0</PackageVersion_MicrosoftExtensions>
27+
<PackageVersion_MsBuild>16.5.0</PackageVersion_MsBuild>
2628

27-
<PackageVersion_MicrosoftTestSdk>16.5.0</PackageVersion_MicrosoftTestSdk>
29+
<PackageVersion_MicrosoftTestSdk>16.6.1</PackageVersion_MicrosoftTestSdk>
2830
<PackageVersion_NSubstitute>4.2.1</PackageVersion_NSubstitute>
29-
<PackageVersion_CoverletMsBuild>2.8.0</PackageVersion_CoverletMsBuild>
31+
<PackageVersion_CoverletMsBuild>2.8.1</PackageVersion_CoverletMsBuild>
3032
<PackageVersion_NUnit>3.12.0</PackageVersion_NUnit>
3133
<PackageVersion_GitToolsTesting>1.2.0</PackageVersion_GitToolsTesting>
3234
<PackageVersion_NUnit3TestAdapter>3.16.1</PackageVersion_NUnit3TestAdapter>
@@ -36,7 +38,10 @@
3638
</PropertyGroup>
3739

3840
<ItemGroup>
39-
<None Include="../../docs/input/docs/img/package_icon.png" Pack="true" PackagePath="/" />
41+
<None Include="../../docs/input/docs/img/package_icon.png">
42+
<Pack>true</Pack>
43+
<PackagePath>/</PackagePath>
44+
</None>
4045
</ItemGroup>
4146

4247
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">

‎src/GitVersionCore.Tests/BuildServers/AzurePipelinesTests.cs renamed to ‎src/GitVersionCore.Tests/BuildAgents/AzurePipelinesTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
using GitVersion;
2-
using GitVersion.BuildServers;
2+
using GitVersion.BuildAgents;
33
using GitVersionCore.Tests.Helpers;
44
using Microsoft.Extensions.DependencyInjection;
55
using NUnit.Framework;
66
using Shouldly;
77

8-
namespace GitVersionCore.Tests.BuildServers
8+
namespace GitVersionCore.Tests.BuildAgents
99
{
1010
[TestFixture]
1111
public class AzurePipelinesTests : TestBase

‎src/GitVersionCore.Tests/BuildServers/BuildServerBaseTests.cs renamed to ‎src/GitVersionCore.Tests/BuildAgents/BuildServerBaseTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using NUnit.Framework;
1010
using Shouldly;
1111

12-
namespace GitVersionCore.Tests.BuildServers
12+
namespace GitVersionCore.Tests.BuildAgents
1313
{
1414
[TestFixture]
1515
public class BuildServerBaseTests : TestBase
@@ -22,7 +22,7 @@ public void SetUp()
2222
{
2323
sp = ConfigureServices(services =>
2424
{
25-
services.AddSingleton<BuildServer>();
25+
services.AddSingleton<BuildAgent>();
2626
});
2727
buildServer = sp.GetService<IVariableProvider>();
2828
}
@@ -46,17 +46,17 @@ public void BuildNumberIsFullSemVer()
4646
var config = new TestEffectiveConfiguration();
4747

4848
var variables = this.buildServer.GetVariablesFor(semanticVersion, config, false);
49-
var buildServer = sp.GetService<BuildServer>();
49+
var buildServer = sp.GetService<BuildAgent>();
5050
buildServer.WriteIntegration(writes.Add, variables);
5151

5252
writes[1].ShouldBe("1.2.3-beta.1+5");
5353
}
5454

55-
private class BuildServer : BuildServerBase
55+
private class BuildAgent : BuildAgentBase
5656
{
5757
protected override string EnvironmentVariable { get; }
5858

59-
public BuildServer(IEnvironment environment, ILog log) : base(environment, log)
59+
public BuildAgent(IEnvironment environment, ILog log) : base(environment, log)
6060
{
6161
}
6262

‎src/GitVersionCore.Tests/BuildServers/CodeBuildTests.cs renamed to ‎src/GitVersionCore.Tests/BuildAgents/CodeBuildTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
using System.IO;
44
using System.Reflection;
55
using GitVersion;
6-
using GitVersion.BuildServers;
6+
using GitVersion.BuildAgents;
77
using GitVersion.VersionCalculation;
88
using GitVersionCore.Tests.Helpers;
99
using Microsoft.Extensions.DependencyInjection;
1010
using NUnit.Framework;
1111
using Shouldly;
1212

13-
namespace GitVersionCore.Tests.BuildServers
13+
namespace GitVersionCore.Tests.BuildAgents
1414
{
1515
[TestFixture]
1616
public sealed class CodeBuildTests : TestBase

‎src/GitVersionCore.Tests/BuildServers/ContinuaCiTests.cs renamed to ‎src/GitVersionCore.Tests/BuildAgents/ContinuaCiTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using System;
2-
using GitVersion.BuildServers;
2+
using GitVersion.BuildAgents;
33
using GitVersionCore.Tests.Helpers;
44
using Microsoft.Extensions.DependencyInjection;
55
using NUnit.Framework;
66

7-
namespace GitVersionCore.Tests.BuildServers
7+
namespace GitVersionCore.Tests.BuildAgents
88
{
99
[TestFixture]
1010
public class ContinuaCiTests : TestBase

‎src/GitVersionCore.Tests/BuildServers/DroneTests.cs renamed to ‎src/GitVersionCore.Tests/BuildAgents/DroneTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
using System;
22
using GitVersion;
3-
using GitVersion.BuildServers;
3+
using GitVersion.BuildAgents;
44
using GitVersionCore.Tests.Helpers;
55
using Microsoft.Extensions.DependencyInjection;
66
using NUnit.Framework;
77
using Shouldly;
88

9-
namespace GitVersionCore.Tests.BuildServers
9+
namespace GitVersionCore.Tests.BuildAgents
1010
{
1111
[TestFixture]
1212
public class DroneTests : TestBase

‎src/GitVersionCore.Tests/BuildServers/EnvRunTests.cs renamed to ‎src/GitVersionCore.Tests/BuildAgents/EnvRunTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
using System.IO;
22
using GitVersion;
3-
using GitVersion.BuildServers;
3+
using GitVersion.BuildAgents;
44
using GitVersionCore.Tests.Helpers;
55
using Microsoft.Extensions.DependencyInjection;
66
using NUnit.Framework;
77
using Shouldly;
88

9-
namespace GitVersionCore.Tests.BuildServers
9+
namespace GitVersionCore.Tests.BuildAgents
1010
{
1111
[TestFixture]
1212
public class EnvRunTests : TestBase

‎src/GitVersionCore.Tests/BuildServers/GitHubActionsTests.cs renamed to ‎src/GitVersionCore.Tests/BuildAgents/GitHubActionsTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
using System.Collections.Generic;
22
using GitVersion;
3-
using GitVersion.BuildServers;
3+
using GitVersion.BuildAgents;
44
using GitVersionCore.Tests.Helpers;
55
using Microsoft.Extensions.DependencyInjection;
66
using NUnit.Framework;
77
using Shouldly;
88
using Environment = System.Environment;
99

10-
namespace GitVersionCore.Tests.BuildServers
10+
namespace GitVersionCore.Tests.BuildAgents
1111
{
1212

1313
[TestFixture]

‎src/GitVersionCore.Tests/BuildServers/GitLabCiTests.cs renamed to ‎src/GitVersionCore.Tests/BuildAgents/GitLabCiTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
using System.IO;
44
using System.Reflection;
55
using GitVersion;
6-
using GitVersion.BuildServers;
6+
using GitVersion.BuildAgents;
77
using GitVersion.VersionCalculation;
88
using GitVersionCore.Tests.Helpers;
99
using Microsoft.Extensions.DependencyInjection;
1010
using NUnit.Framework;
1111
using Shouldly;
1212

13-
namespace GitVersionCore.Tests.BuildServers
13+
namespace GitVersionCore.Tests.BuildAgents
1414
{
1515
[TestFixture]
1616
public class GitLabCiTests : TestBase

‎src/GitVersionCore.Tests/BuildServers/JenkinsTests.cs renamed to ‎src/GitVersionCore.Tests/BuildAgents/JenkinsTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
using System.IO;
44
using System.Reflection;
55
using GitVersion;
6-
using GitVersion.BuildServers;
6+
using GitVersion.BuildAgents;
77
using GitVersion.VersionCalculation;
88
using GitVersionCore.Tests.Helpers;
99
using Microsoft.Extensions.DependencyInjection;
1010
using NUnit.Framework;
1111
using Shouldly;
1212

13-
namespace GitVersionCore.Tests.BuildServers
13+
namespace GitVersionCore.Tests.BuildAgents
1414
{
1515
[TestFixture]
1616
public class JenkinsTests : TestBase

‎src/GitVersionCore.Tests/BuildServers/MyGetTests.cs renamed to ‎src/GitVersionCore.Tests/BuildAgents/MyGetTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using GitVersion.BuildServers;
1+
using GitVersion.BuildAgents;
22
using GitVersionCore.Tests.Helpers;
33
using Microsoft.Extensions.DependencyInjection;
44
using NUnit.Framework;
55

6-
namespace GitVersionCore.Tests.BuildServers
6+
namespace GitVersionCore.Tests.BuildAgents
77
{
88
[TestFixture]
99
public class MyGetTests : TestBase

‎src/GitVersionCore.Tests/BuildServers/TeamCityTests.cs renamed to ‎src/GitVersionCore.Tests/BuildAgents/TeamCityTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using GitVersion.BuildServers;
1+
using GitVersion.BuildAgents;
22
using GitVersionCore.Tests.Helpers;
33
using Microsoft.Extensions.DependencyInjection;
44
using NUnit.Framework;
55

6-
namespace GitVersionCore.Tests.BuildServers
6+
namespace GitVersionCore.Tests.BuildAgents
77
{
88
[TestFixture]
99
public class TeamCityTests : TestBase

‎src/GitVersionCore.Tests/Configuration/ConfigProviderTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class ConfigProviderTests : TestBase
3333
public void Setup()
3434
{
3535
repoPath = DefaultRepoPath;
36-
var options = Options.Create(new Arguments { TargetPath = repoPath });
36+
var options = Options.Create(new GitVersionOptions { WorkingDirectory = repoPath });
3737
var sp = ConfigureServices(services =>
3838
{
3939
services.AddSingleton(options);
@@ -264,7 +264,7 @@ public void NoWarnOnGitVersionYmlFile()
264264
var logAppender = new TestLogAppender(Action);
265265
var log = new Log(logAppender);
266266

267-
var options = Options.Create(new Arguments { TargetPath = repoPath });
267+
var options = Options.Create(new GitVersionOptions { WorkingDirectory = repoPath });
268268
var sp = ConfigureServices(services =>
269269
{
270270
services.AddSingleton(options);

‎src/GitVersionCore.Tests/Configuration/DefaultConfigFileLocatorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void Setup()
2626
{
2727
repoPath = DefaultRepoPath;
2828
workingPath = DefaultWorkingPath;
29-
var options = Options.Create(new Arguments { TargetPath = repoPath });
29+
var options = Options.Create(new GitVersionOptions { WorkingDirectory = repoPath });
3030

3131
var sp = ConfigureServices(services =>
3232
{

‎src/GitVersionCore.Tests/Configuration/Init/InitScenarios.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void Setup()
2626
public void CanSetNextVersion()
2727
{
2828
var workingDirectory = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "c:\\proj" : "/proj";
29-
var options = Options.Create(new Arguments { TargetPath = workingDirectory });
29+
var options = Options.Create(new GitVersionOptions { WorkingDirectory = workingDirectory });
3030

3131
var sp = ConfigureServices(services =>
3232
{

0 commit comments

Comments
 (0)