Skip to content

Commit c4a2dad

Browse files
DamianKedziorDamianKedzior
committed
Merge branch 'bug/2122-sequence-contains-no-elements' of https://github.com/DamianKedzior/GitVersion into bug/2122-sequence-contains-no-elements
2 parents baf4bd2 + 39248c4 commit c4a2dad

File tree

62 files changed

+96
-462
lines changed

Some content is hidden

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

62 files changed

+96
-462
lines changed

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,5 +124,5 @@ src/Docker/**/content
124124
config.wyam.dll
125125
config.wyam.hash
126126
config.wyam.packages.xml
127-
/test/core/build
128-
/test/full/build
127+
/tests/integration/core/build
128+
/tests/integration/full/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.806,3.1.202
2+
DOTNET_VERSION=2.1.807,3.1.301

‎build/artifacts-test.cake‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Task("Artifacts-MsBuildCore-Test")
117117
continue;
118118
}
119119

120-
var cmd = $"-file {rootPrefix}/scripts/Test-MsBuildCore.ps1 -version {version} -repoPath {rootPrefix}/repo/test/core -nugetPath {rootPrefix}/nuget -targetframework {targetframework}";
120+
var cmd = $"-file {rootPrefix}/scripts/Test-MsBuildCore.ps1 -version {version} -repoPath {rootPrefix}/repo/tests/integration/core -nugetPath {rootPrefix}/nuget -targetframework {targetframework}";
121121

122122
DockerTestArtifact(dockerImage, parameters, cmd);
123123
}
@@ -141,7 +141,7 @@ Task("Artifacts-MsBuildFull-Test")
141141
dotnetCoreMsBuildSettings.WithProperty("TargetFramework", framework);
142142
dotnetCoreMsBuildSettings.WithProperty("GitVersionTaskVersion", version);
143143

144-
var projPath = MakeAbsolute(new DirectoryPath("./test/core"));
144+
var projPath = MakeAbsolute(new DirectoryPath("./tests/integration/core"));
145145

146146
DotNetCoreBuild(projPath.FullPath, new DotNetCoreBuildSettings
147147
{
@@ -151,7 +151,7 @@ Task("Artifacts-MsBuildFull-Test")
151151
ArgumentCustomization = args => args.Append($"--source {nugetSource}")
152152
});
153153

154-
var netcoreExe = new DirectoryPath("./test/core/build").Combine(framework).CombineWithFilePath("app.dll");
154+
var netcoreExe = new DirectoryPath("./tests/integration/core/build").Combine(framework).CombineWithFilePath("app.dll");
155155
ValidateOutput("dotnet", netcoreExe.FullPath, parameters.Version.GitVersion.FullSemVer);
156156
}
157157

@@ -166,9 +166,9 @@ Task("Artifacts-MsBuildFull-Test")
166166
msBuildSettings.WithProperty("GitVersionTaskVersion", version);
167167
msBuildSettings.WithProperty("RestoreSource", nugetSource);
168168

169-
MSBuild("./test/full", msBuildSettings);
169+
MSBuild("./tests/integration/full", msBuildSettings);
170170

171-
var fullExe = new DirectoryPath("./test/full/build").CombineWithFilePath("app.exe");
171+
var fullExe = new DirectoryPath("./tests/integration/full/build").CombineWithFilePath("app.exe");
172172
ValidateOutput(fullExe.FullPath, null, parameters.Version.GitVersion.FullSemVer);
173173
});
174174

‎build/utils/docker.cake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ DockerContainerRunSettings GetDockerRunSettings(BuildParameters parameters)
116116
Volume = new[]
117117
{
118118
$"{currentDir}:{root}/repo",
119-
$"{currentDir}/test-scripts:{root}/scripts",
119+
$"{currentDir}/tests/scripts:{root}/scripts",
120120
$"{currentDir}/artifacts/v{parameters.Version.SemVersion}/nuget:{root}/nuget",
121121
$"{currentDir}/artifacts/v{parameters.Version.SemVersion}/native/linux:{root}/native",
122122
}

‎src/Directory.Build.props‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
<PackageReleaseNotes>https://github.com/GitTools/GitVersion/releases</PackageReleaseNotes>
1616
<Company>$(Authors)</Company>
1717

18+
<LangVersion>8.0</LangVersion>
19+
1820
</PropertyGroup>
1921
<PropertyGroup>
2022
<PackageVersion_LibGit2Sharp>0.27.0-preview-0034</PackageVersion_LibGit2Sharp>
@@ -24,7 +26,7 @@
2426
<PackageVersion_YamlDotNet>8.1.2</PackageVersion_YamlDotNet>
2527
<PackageVersion_NewtonsoftJson>12.0.3</PackageVersion_NewtonsoftJson>
2628
<PackageVersion_MicrosoftExtensions>3.0.0</PackageVersion_MicrosoftExtensions>
27-
<PackageVersion_MsBuild>16.5.0</PackageVersion_MsBuild>
29+
<PackageVersion_MsBuild>16.6.0</PackageVersion_MsBuild>
2830

2931
<PackageVersion_MicrosoftTestSdk>16.6.1</PackageVersion_MicrosoftTestSdk>
3032
<PackageVersion_NSubstitute>4.2.1</PackageVersion_NSubstitute>
@@ -37,6 +39,26 @@
3739

3840
</PropertyGroup>
3941

42+
<ItemGroup Condition=" '$(IsTestProject)' == 'true' ">
43+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion_MicrosoftTestSdk)" />
44+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(PackageVersion_MicrosoftExtensions)" />
45+
46+
<PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)" />
47+
<PackageReference Include="Newtonsoft.Json" Version="$(PackageVersion_NewtonsoftJson)" />
48+
<PackageReference Include="NSubstitute" Version="$(PackageVersion_NSubstitute)" />
49+
50+
<PackageReference Include="NUnit" Version="$(PackageVersion_NUnit)" />
51+
<PackageReference Include="NUnit3TestAdapter" Version="$(PackageVersion_NUnit3TestAdapter)" />
52+
<PackageReference Include="NunitXml.TestLogger" Version="$(PackageVersion_NunitXmlTestLogger)" />
53+
<PackageReference Include="Shouldly" Version="$(PackageVersion_Shouldly)" />
54+
<PackageReference Include="GitTools.Testing" Version="$(PackageVersion_GitToolsTesting)" />
55+
56+
<PackageReference Include="coverlet.msbuild" Version="$(PackageVersion_CoverletMsBuild)">
57+
<PrivateAssets>all</PrivateAssets>
58+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
59+
</PackageReference>
60+
</ItemGroup>
61+
4062
<ItemGroup>
4163
<None Include="../../docs/input/docs/img/package_icon.png">
4264
<Pack>true</Pack>

‎src/GitVersion.sln‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2222
..\GitVersion.yml = ..\GitVersion.yml
2323
..\LICENSE = ..\LICENSE
2424
..\README.md = ..\README.md
25-
test.props = test.props
2625
EndProjectSection
2726
EndProject
2827
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionCore", "GitVersionCore\GitVersionCore.csproj", "{F9741A0D-B9D7-4557-9A1C-A7252C1071F5}"

‎src/GitVersionCore.Tests/GitVersionCore.Tests.csproj‎

Lines changed: 4 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -6,59 +6,22 @@
66
<DebugType>full</DebugType>
77
<Optimize>false</Optimize>
88
<DebugSymbols>true</DebugSymbols>
9-
<LangVersion>8.0</LangVersion>
9+
10+
<IsTestProject>true</IsTestProject>
1011
</PropertyGroup>
1112

12-
<Import Project="..\test.props" />
1313
<ItemGroup>
1414
<PackageReference Include="FluentDateTime" Version="2.0.0" />
1515
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="$(PackageVersion_LibGit2Sharp_NativeBinaries)" />
16-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(PackageVersion_MicrosoftExtensions)" />
1716
<PackageReference Include="Microsoft.Extensions.Options" Version="$(PackageVersion_MicrosoftExtensions)" />
1817
<PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)" />
1918
</ItemGroup>
2019
<ItemGroup>
2120
<ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj" />
2221
</ItemGroup>
2322
<ItemGroup>
24-
<Content Include="Approved\**\*.approved.txt" />
25-
<Content Include="VersionCalculation\Approved\JsonVersionBuilderTests.Json.approved.txt" />
26-
<Content Include="VersionCalculation\Approved\VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForFeatureBranch.approved.txt" />
27-
<Content Include="VersionCalculation\Approved\VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForFeatureBranchWithCustomAssemblyInfoFormat.approved.txt" />
28-
<Content Include="VersionCalculation\Approved\VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt" />
29-
<Content Include="VersionCalculation\Approved\VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt" />
30-
<Content Include="VersionCalculation\Approved\VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt" />
31-
<Content Include="VersionCalculation\Approved\VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt" />
32-
<Content Include="VersionCalculation\Approved\VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt" />
33-
<Content Include="VersionCalculation\Approved\VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt" />
34-
<Content Include="VersionConverters\Approved\cs\AssemblyInfoFileUpdaterTests.Issue1183ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttributes.approved.txt" />
35-
<Content Include="VersionConverters\Approved\cs\AssemblyInfoFileUpdaterTests.ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile.approved.txt" />
36-
<Content Include="VersionConverters\Approved\cs\AssemblyInfoFileUpdaterTests.ShouldCreateAssemblyInfoFileAtPathWhenNotExistsAndEnsureAssemblyInfo.approved.txt" />
37-
<Content Include="VersionConverters\Approved\cs\AssemblyInfoFileUpdaterTests.ShouldCreateAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInfo.approved.txt" />
38-
<Content Include="VersionConverters\Approved\cs\AssemblyInfoFileUpdaterTests.ShouldCreateAssemblyInfoFileWhenNotExistsAndEnsureAssemblyInfo.approved.txt" />
39-
<Content Include="VersionConverters\Approved\cs\AssemblyInfoFileUpdaterTests.ShouldNotAddAssemblyInformationalVersionWhenVersionSchemeIsNone.approved.txt" />
40-
<Content Include="VersionConverters\Approved\cs\AssemblyInfoFileUpdaterTests.ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone.approved.txt" />
41-
<Content Include="VersionConverters\Approved\cs\GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt" />
42-
<Content Include="VersionConverters\Approved\fs\AssemblyInfoFileUpdaterTests.Issue1183ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttributes.approved.txt" />
43-
<Content Include="VersionConverters\Approved\fs\AssemblyInfoFileUpdaterTests.ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile.approved.txt" />
44-
<Content Include="VersionConverters\Approved\fs\AssemblyInfoFileUpdaterTests.ShouldCreateAssemblyInfoFileAtPathWhenNotExistsAndEnsureAssemblyInfo.approved.txt" />
45-
<Content Include="VersionConverters\Approved\fs\AssemblyInfoFileUpdaterTests.ShouldCreateAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInfo.approved.txt" />
46-
<Content Include="VersionConverters\Approved\fs\AssemblyInfoFileUpdaterTests.ShouldCreateAssemblyInfoFileWhenNotExistsAndEnsureAssemblyInfo.approved.txt" />
47-
<Content Include="VersionConverters\Approved\fs\AssemblyInfoFileUpdaterTests.ShouldNotAddAssemblyInformationalVersionWhenVersionSchemeIsNone.approved.txt" />
48-
<Content Include="VersionConverters\Approved\fs\AssemblyInfoFileUpdaterTests.ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone.approved.txt" />
49-
<Content Include="VersionConverters\Approved\fs\GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt" />
50-
<Content Include="VersionConverters\Approved\vb\AssemblyInfoFileUpdaterTests.Issue1183ShouldAddFSharpAssemblyInformationalVersionBesideOtherAttributes.approved.txt" />
51-
<Content Include="VersionConverters\Approved\vb\AssemblyInfoFileUpdaterTests.ShouldAddAssemblyInformationalVersionWhenUpdatingAssemblyVersionFile.approved.txt" />
52-
<Content Include="VersionConverters\Approved\vb\AssemblyInfoFileUpdaterTests.ShouldCreateAssemblyInfoFileAtPathWhenNotExistsAndEnsureAssemblyInfo.approved.txt" />
53-
<Content Include="VersionConverters\Approved\vb\AssemblyInfoFileUpdaterTests.ShouldCreateAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInfo.approved.txt" />
54-
<Content Include="VersionConverters\Approved\vb\AssemblyInfoFileUpdaterTests.ShouldCreateAssemblyInfoFileWhenNotExistsAndEnsureAssemblyInfo.approved.txt" />
55-
<Content Include="VersionConverters\Approved\vb\AssemblyInfoFileUpdaterTests.ShouldNotAddAssemblyInformationalVersionWhenVersionSchemeIsNone.approved.txt" />
56-
<Content Include="VersionConverters\Approved\vb\AssemblyInfoFileUpdaterTests.ShouldNotReplaceAssemblyVersionWhenVersionSchemeIsNone.approved.txt" />
57-
<Content Include="VersionConverters\Approved\vb\GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt" />
58-
<Content Include="VersionConverters\Approved\WixFileTests.UpdateWixVersionFile.approved.txt" />
59-
</ItemGroup>
60-
<ItemGroup>
61-
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
23+
<Content Include="VersionCalculation\Approved\**\*.approved.txt" />
24+
<Content Include="VersionConverters\Approved\**\*.approved.txt" />
6225
</ItemGroup>
6326

6427
</Project>

‎src/GitVersionCore.Tests/VersionConverters/Approved/fs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,38 +8,40 @@
88
// </auto-generated>
99
//------------------------------------------------------------------------------
1010

11+
namespace global
12+
1113
[<AbstractClass; Sealed>]
1214
[<global.System.Runtime.CompilerServices.CompilerGenerated>]
1315
[<global.System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage>]
14-
module GitVersionInformation
15-
let Major = "1"
16-
let Minor = "2"
17-
let Patch = "3"
18-
let PreReleaseTag = "unstable.4"
19-
let PreReleaseTagWithDash = "-unstable.4"
20-
let PreReleaseLabel = "unstable"
21-
let PreReleaseNumber = "4"
22-
let WeightedPreReleaseNumber = "4"
23-
let BuildMetaData = "5"
24-
let BuildMetaDataPadded = "0005"
25-
let FullBuildMetaData = "5.Branch.feature1.Sha.commitSha"
26-
let MajorMinorPatch = "1.2.3"
27-
let SemVer = "1.2.3-unstable.4"
28-
let LegacySemVer = "1.2.3-unstable4"
29-
let LegacySemVerPadded = "1.2.3-unstable0004"
30-
let AssemblySemVer = "1.2.3.0"
31-
let AssemblySemFileVer = "1.2.3.0"
32-
let FullSemVer = "1.2.3-unstable.4+5"
33-
let InformationalVersion = "1.2.3-unstable.4+5.Branch.feature1.Sha.commitSha"
34-
let BranchName = "feature1"
35-
let EscapedBranchName = "feature1"
36-
let Sha = "commitSha"
37-
let ShortSha = "commitShortSha"
38-
let NuGetVersionV2 = "1.2.3-unstable0004"
39-
let NuGetVersion = "1.2.3-unstable0004"
40-
let NuGetPreReleaseTagV2 = "unstable0004"
41-
let NuGetPreReleaseTag = "unstable0004"
42-
let VersionSourceSha = "versionSourceSha"
43-
let CommitsSinceVersionSource = "5"
44-
let CommitsSinceVersionSourcePadded = "0005"
45-
let CommitDate = "2014-03-06"
16+
type GitVersionInformation =
17+
static member Major = "1"
18+
static member Minor = "2"
19+
static member Patch = "3"
20+
static member PreReleaseTag = "unstable.4"
21+
static member PreReleaseTagWithDash = "-unstable.4"
22+
static member PreReleaseLabel = "unstable"
23+
static member PreReleaseNumber = "4"
24+
static member WeightedPreReleaseNumber = "4"
25+
static member BuildMetaData = "5"
26+
static member BuildMetaDataPadded = "0005"
27+
static member FullBuildMetaData = "5.Branch.feature1.Sha.commitSha"
28+
static member MajorMinorPatch = "1.2.3"
29+
static member SemVer = "1.2.3-unstable.4"
30+
static member LegacySemVer = "1.2.3-unstable4"
31+
static member LegacySemVerPadded = "1.2.3-unstable0004"
32+
static member AssemblySemVer = "1.2.3.0"
33+
static member AssemblySemFileVer = "1.2.3.0"
34+
static member FullSemVer = "1.2.3-unstable.4+5"
35+
static member InformationalVersion = "1.2.3-unstable.4+5.Branch.feature1.Sha.commitSha"
36+
static member BranchName = "feature1"
37+
static member EscapedBranchName = "feature1"
38+
static member Sha = "commitSha"
39+
static member ShortSha = "commitShortSha"
40+
static member NuGetVersionV2 = "1.2.3-unstable0004"
41+
static member NuGetVersion = "1.2.3-unstable0004"
42+
static member NuGetPreReleaseTagV2 = "unstable0004"
43+
static member NuGetPreReleaseTag = "unstable0004"
44+
static member VersionSourceSha = "versionSourceSha"
45+
static member CommitsSinceVersionSource = "5"
46+
static member CommitsSinceVersionSourcePadded = "0005"
47+
static member CommitDate = "2014-03-06"

‎src/GitVersionCore/Configuration/IBranchConfigurationCalculator.cs‎ renamed to ‎src/GitVersionCore/Configuration/Abstractions/IBranchConfigurationCalculator.cs‎

File renamed without changes.

‎src/GitVersionCore/Configuration/IConfigFileLocator.cs‎ renamed to ‎src/GitVersionCore/Configuration/Abstractions/IConfigFileLocator.cs‎

File renamed without changes.

0 commit comments

Comments
 (0)