Skip to content

Commit 54f7080

Browse files
Added some more gitversion stuff
1 parent 5ba134b commit 54f7080

File tree

3 files changed

+45
-43
lines changed

3 files changed

+45
-43
lines changed

build.cake

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
#tool "nuget:?package=GitVersion.CommandLine"
22
#tool "nuget:?package=xunit.runner.console"
33
#tool "nuget:?package=JetBrains.dotCover.CommandLineTools"
4-
#tool "nuget:?package=coveralls.io.dotcover"
5-
#addin "Cake.Coveralls";
4+
#load "tasks/variables.cake";
65

76
var target = Argument("target", "Default");
87
var configuration = Argument("configuration", "Release");
@@ -28,7 +27,8 @@ Task("Build")
2827
foreach (var project in GetFiles("src/*/*.csproj").Concat(GetFiles("test/*/*.csproj")))
2928
DotNetCoreBuild(project.FullPath, new DotNetCoreBuildSettings
3029
{
31-
Configuration = configuration
30+
Configuration = configuration,
31+
EnvironmentVariables = GitVersionEnvironmentVariables,
3232
});
3333
});
3434

@@ -42,6 +42,7 @@ Task("Test")
4242
foreach (var testProject in GetFiles("test/*/*.csproj")) {
4343
StartProcess("dotnet", new ProcessSettings() {
4444
WorkingDirectory = testProject.GetDirectory(),
45+
EnvironmentVariables = GitVersionEnvironmentVariables,
4546
Arguments = new ProcessArgumentBuilder()
4647
.Append("xunit")
4748
.Append("-noshadow")
@@ -72,9 +73,11 @@ Task("Coverage")
7273
// });
7374
tool.StartProcess(Context.Tools.Resolve("dotnet.exe"), new ProcessSettings() {
7475
WorkingDirectory = testProject.GetDirectory(),
76+
EnvironmentVariables = GitVersionEnvironmentVariables,
7577
Arguments = new ProcessArgumentBuilder()
7678
.Append("xunit")
7779
.Append("-noshadow")
80+
.Append("-noautoreporters")
7881
.AppendSwitch("-configuration", configuration)
7982
.AppendSwitch("-framework", "net46")
8083
.AppendSwitchQuotedSecret("-xml", string.Format("{0}/tests/{1}.xml", artifacts, testProject.GetFilenameWithoutExtension()))
@@ -117,50 +120,15 @@ Task("Coverage")
117120
);
118121
});
119122

120-
Task("Coveralls [AppVeyor]")
121-
.IsDependentOn("Coverage")
122-
.WithCriteria(AppVeyor.IsRunningOnAppVeyor)
123+
Task("GitVersion")
123124
.Does(() => {
124-
CoverallsNet(artifacts + "/coverage/coverage.opencover", CoverallsNetReportType.OpenCover, new CoverallsNetSettings()
125-
{
126-
RepoToken = EnvironmentVariable("coveralls_repo_token"),
127-
UseRelativePaths = true,
128-
ServiceName = "Appveyor",
129-
CommitId = EnvironmentVariable("APPVEYOR_REPO_COMMIT"),
130-
CommitBranch = EnvironmentVariable("APPVEYOR_REPO_BRANCH"),
131-
CommitAuthor = EnvironmentVariable("APPVEYOR_REPO_COMMIT_AUTHOR"),
132-
CommitEmail = EnvironmentVariable("APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL"),
133-
CommitMessage = EnvironmentVariable("APPVEYOR_REPO_COMMIT_MESSAGE") + (EnvironmentVariable("APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED") ?? string.Empty),
134-
});
135-
});
136125

137-
Task("Coveralls [TravisCI]")
138-
.IsDependentOn("Coverage")
139-
.WithCriteria(TravisCI.IsRunningOnTravisCI)
140-
.Does(() => {
141-
CoverallsNet(artifacts + "/coverage/coverage.opencover", CoverallsNetReportType.OpenCover, new CoverallsNetSettings()
142-
{
143-
RepoToken = EnvironmentVariable("coveralls_repo_token"),
144-
UseRelativePaths = true,
145-
ServiceName = "TravisCI",
146-
// CommitId = EnvironmentVariable("APPVEYOR_REPO_COMMIT"),
147-
// CommitBranch = EnvironmentVariable("APPVEYOR_REPO_BRANCH"),
148-
// CommitAuthor = EnvironmentVariable("APPVEYOR_REPO_COMMIT_AUTHOR"),
149-
// CommitEmail = EnvironmentVariable("APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL"),
150-
// CommitMessage = EnvironmentVariable("APPVEYOR_REPO_COMMIT_MESSAGE") + (EnvironmentVariable("APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED") ?? string.Empty),
151-
});
152126
});
153127

154-
Task("Coveralls")
155-
.IsDependentOn("Coverage")
156-
.IsDependentOn("Coveralls [TravisCI]")
157-
.IsDependentOn("Coveralls [AppVeyor]");
158-
159-
160128
Task("Default")
161129
.IsDependentOn("Clean")
162130
.IsDependentOn("Build")
163131
.IsDependentOn("Test")
164-
.IsDependentOn("Coveralls");
132+
.IsDependentOn("Coverage");
165133

166134
RunTarget(target);

src/JsonRpc/JsonRpc.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
<PlatformTarget>AnyCPU</PlatformTarget>
55
<!-- Needed for Microsoft.Composition -->
66
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dotnet5.4;portable-net45+win8</PackageTargetFallback>
7+
<PackageVersion Condition="'$(GitVersion_NuGetVersion)' != ''">$(GitVersion_NuGetVersion)</PackageVersion>
8+
<AssemblyVersion Condition="'$(GitVersion_AssemblySemVer)' != ''">$(GitVersion_AssemblySemVer)</AssemblyVersion>
9+
<FileVersion Condition="'$(GitVersion_AssemblySemVer)' != ''">$(GitVersion_AssemblySemVer)</FileVersion>
10+
<InformationalVersion Condition="'$(GitVersion_InformationalVersion)' != ''">$(GitVersion_InformationalVersion)</InformationalVersion>
711
</PropertyGroup>
812
<ItemGroup>
913
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />

tasks/variables.cake

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1-
var target = Argument("target", "Default");
2-
var configuration = Argument("configuration", "Release");
3-
var artifacts = "./artifacts";
1+
Lazy<GitVersion> GitVersionInstance = new Lazy<GitVersion>(() => {
2+
return GitVersion();
3+
});
4+
5+
Dictionary<string, string> GitVersionEnvironmentVariables { get {
6+
var gv = GitVersionInstance.Value;
7+
8+
return new Dictionary<string, string>() {
9+
{ "GitVersion_Major", gv.Major.ToString() },
10+
{ "GitVersion_Minor", gv.Minor.ToString() },
11+
{ "GitVersion_Patch", gv.Patch.ToString() },
12+
{ "GitVersion_PreReleaseTag", gv.PreReleaseTag },
13+
{ "GitVersion_PreReleaseTagWithDash", gv.PreReleaseTagWithDash },
14+
{ "GitVersion_PreReleaseLabel", gv.PreReleaseLabel },
15+
{ "GitVersion_PreReleaseNumber", gv.PreReleaseNumber },
16+
{ "GitVersion_BuildMetaData", gv.BuildMetaData },
17+
{ "GitVersion_BuildMetaDataPadded", gv.BuildMetaDataPadded },
18+
{ "GitVersion_FullBuildMetaData", gv.FullBuildMetaData },
19+
{ "GitVersion_MajorMinorPatch", gv.MajorMinorPatch },
20+
{ "GitVersion_SemVer", gv.SemVer },
21+
{ "GitVersion_LegacySemVer", gv.LegacySemVer },
22+
{ "GitVersion_LegacySemVerPadded", gv.LegacySemVerPadded },
23+
{ "GitVersion_AssemblySemVer", gv.AssemblySemVer },
24+
{ "GitVersion_FullSemVer", gv.FullSemVer },
25+
{ "GitVersion_InformationalVersion", gv.InformationalVersion },
26+
{ "GitVersion_BranchName", gv.BranchName },
27+
{ "GitVersion_Sha", gv.Sha },
28+
{ "GitVersion_NuGetVersion", gv.NuGetVersion },
29+
{ "GitVersion_CommitsSinceVersionSource", gv.CommitsSinceVersionSource },
30+
{ "GitVersion_CommitsSinceVersionSourcePadded", gv.CommitsSinceVersionSourcePadded },
31+
{ "GitVersion_CommitDate", gv.CommitDate },
32+
};
33+
} }

0 commit comments

Comments
 (0)