Skip to content

Commit 6af3b9c

Browse files
arturcicarturcic
committed
removed GitVersionTask in favor of GitVersion.MsBuild
1 parent 4e8d19c commit 6af3b9c

Some content is hidden

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

57 files changed

+5
-4402
lines changed

‎build/pack.cake

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,6 @@ Task("Pack-Prepare")
44
{
55
PackPrepareNative(Context, parameters);
66

7-
var frameworks = new[] { parameters.CoreFxVersion31, parameters.FullFxVersion48 };
8-
9-
// MsBuild Task
10-
foreach(var framework in frameworks)
11-
{
12-
DotNetCorePublish("./src/GitVersionTask/GitVersionTask.csproj", new DotNetCorePublishSettings
13-
{
14-
Framework = framework,
15-
Configuration = parameters.Configuration,
16-
MSBuildSettings = parameters.MSBuildSettings
17-
});
18-
}
19-
207
var sourceDir = parameters.Paths.Directories.Native.Combine(PlatformFamily.Windows.ToString()).Combine("win-x64");
218
var sourceFiles = GetFiles(sourceDir + "/*.*");
229

@@ -71,12 +58,11 @@ Task("Pack-Nuget")
7158
MSBuildSettings = parameters.MSBuildSettings
7259
};
7360

74-
// GitVersionTask, global tool & core
61+
// GitVersion.MsBuild, global tool & core
7562
settings.ArgumentCustomization = arg => arg.Append("/p:PackAsTool=true");
7663
DotNetCorePack("./src/GitVersionExe/GitVersionExe.csproj", settings);
7764

7865
settings.ArgumentCustomization = null;
79-
DotNetCorePack("./src/GitVersionTask", settings);
8066
DotNetCorePack("./src/GitVersion.MsBuild", settings);
8167
DotNetCorePack("./src/GitVersionCore", settings);
8268
});

‎build/test.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Task("UnitTest")
3636
CoverletOutputFormat = CoverletOutputFormat.cobertura,
3737
CoverletOutputDirectory = testResultsPath,
3838
CoverletOutputName = $"{projectName}.coverage.xml",
39-
Exclude = new List<string> { "[GitVersion*.Tests]*", "[GitVersionTask.MsBuild]*" }
39+
Exclude = new List<string> { "[GitVersion*.Tests]*" }
4040
};
4141

4242
if (string.Equals(framework, parameters.FullFxVersion48))

‎build/utils/parameters.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public class BuildParameters
123123
Packages = BuildPackages.GetPackages(
124124
Paths.Directories.NugetRoot,
125125
Version,
126-
new [] { "GitVersion.CommandLine", "GitVersion.Core", "GitVersionTask", "GitVersion.MsBuild", "GitVersion.Tool" },
126+
new [] { "GitVersion.CommandLine", "GitVersion.Core", "GitVersion.MsBuild", "GitVersion.Tool" },
127127
new [] { "GitVersion.Portable" });
128128

129129

‎src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,4 @@
1818
<ProjectReference Include="..\GitVersionCore.Tests\GitVersionCore.Tests.csproj" />
1919
</ItemGroup>
2020

21-
<ItemGroup>
22-
<Compile Include="..\GitVersionCore.Tests\Helpers\TestBase.cs" Link="Helpers\TestBase.cs" />
23-
<Compile Include="..\GitVersionCore.Tests\Helpers\TestEnvironment.cs" Link="Helpers\TestEnvironment.cs" />
24-
</ItemGroup>
25-
2621
</Project>

‎src/GitVersion.sln

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ VisualStudioVersion = 16.0.28714.193
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionExe", "GitVersionExe\GitVersionExe.csproj", "{C3578A7B-09A6-4444-9383-0DEAFA4958BD}"
66
EndProject
7-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionTask.Tests", "GitVersionTask.Tests\GitVersionTask.Tests.csproj", "{5A86453B-96FB-4B6E-A283-225BB9F753D3}"
8-
EndProject
97
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionCore.Tests", "GitVersionCore.Tests\GitVersionCore.Tests.csproj", "{BF905F84-382C-440D-92F5-C61108626D8D}"
108
EndProject
119
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3EFFC5D6-88D0-49D9-BB53-E1B7EB49DD45}"
@@ -28,13 +26,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionCore", "GitVersio
2826
EndProject
2927
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionExe.Tests", "GitVersionExe.Tests\GitVersionExe.Tests.csproj", "{75C2BE85-1DAF-4E34-8305-B17AFAA982A6}"
3028
EndProject
31-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionTask", "GitVersionTask\GitVersionTask.csproj", "{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}"
32-
EndProject
33-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionTask.MsBuild", "GitVersionTask.MsBuild\GitVersionTask.MsBuild.csproj", "{0F1AEC4E-E81D-4F84-B2E8-3415A1A4DBF4}"
34-
EndProject
35-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitVersion.MsBuild", "GitVersion.MsBuild\GitVersion.MsBuild.csproj", "{20D61ED7-B5BA-42CD-A05A-85EA1EEA2E2F}"
29+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersion.MsBuild", "GitVersion.MsBuild\GitVersion.MsBuild.csproj", "{20D61ED7-B5BA-42CD-A05A-85EA1EEA2E2F}"
3630
EndProject
37-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitVersion.MsBuild.Tests", "GitVersion.MsBuild.Tests\GitVersion.MsBuild.Tests.csproj", "{B35EF742-95D4-4E6A-B782-BE1C3E5CF9AE}"
31+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersion.MsBuild.Tests", "GitVersion.MsBuild.Tests\GitVersion.MsBuild.Tests.csproj", "{B35EF742-95D4-4E6A-B782-BE1C3E5CF9AE}"
3832
EndProject
3933
Global
4034
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -46,10 +40,6 @@ Global
4640
{C3578A7B-09A6-4444-9383-0DEAFA4958BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
4741
{C3578A7B-09A6-4444-9383-0DEAFA4958BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
4842
{C3578A7B-09A6-4444-9383-0DEAFA4958BD}.Release|Any CPU.Build.0 = Release|Any CPU
49-
{5A86453B-96FB-4B6E-A283-225BB9F753D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50-
{5A86453B-96FB-4B6E-A283-225BB9F753D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
51-
{5A86453B-96FB-4B6E-A283-225BB9F753D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
52-
{5A86453B-96FB-4B6E-A283-225BB9F753D3}.Release|Any CPU.Build.0 = Release|Any CPU
5343
{BF905F84-382C-440D-92F5-C61108626D8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5444
{BF905F84-382C-440D-92F5-C61108626D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
5545
{BF905F84-382C-440D-92F5-C61108626D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -62,14 +52,6 @@ Global
6252
{75C2BE85-1DAF-4E34-8305-B17AFAA982A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
6353
{75C2BE85-1DAF-4E34-8305-B17AFAA982A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
6454
{75C2BE85-1DAF-4E34-8305-B17AFAA982A6}.Release|Any CPU.Build.0 = Release|Any CPU
65-
{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
66-
{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
67-
{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
68-
{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}.Release|Any CPU.Build.0 = Release|Any CPU
69-
{0F1AEC4E-E81D-4F84-B2E8-3415A1A4DBF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
70-
{0F1AEC4E-E81D-4F84-B2E8-3415A1A4DBF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
71-
{0F1AEC4E-E81D-4F84-B2E8-3415A1A4DBF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
72-
{0F1AEC4E-E81D-4F84-B2E8-3415A1A4DBF4}.Release|Any CPU.Build.0 = Release|Any CPU
7355
{20D61ED7-B5BA-42CD-A05A-85EA1EEA2E2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7456
{20D61ED7-B5BA-42CD-A05A-85EA1EEA2E2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
7557
{20D61ED7-B5BA-42CD-A05A-85EA1EEA2E2F}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎src/GitVersionTask.MsBuild/GitVersionTask.MsBuild.csproj

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/GitVersionTask.MsBuild/GitVersionTaskBase.cs

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎src/GitVersionTask.MsBuild/LibGit2Sharp/GitLoaderContext.cs

Lines changed: 0 additions & 100 deletions
This file was deleted.

‎src/GitVersionTask.MsBuild/LibGit2Sharp/LibGit2SharpLoader.cs

Lines changed: 0 additions & 92 deletions
This file was deleted.

0 commit comments

Comments
 (0)