Skip to content

Commit

Permalink
Updated build scripts and unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
ravensorb committed Jan 7, 2020
1 parent 3427ae9 commit 9257053
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 26 deletions.
5 changes: 2 additions & 3 deletions build.cake
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
#load "tools/settingsUtils.cake"
///////////////////////////////////////////////////////////////////////////////
// Directives
///////////////////////////////////////////////////////////////////////////////

#l "tools/versionUtils.cake"
#l "tools/settingsUtils.cake"
#tool "nuget:?package=NUnit.ConsoleRunner&version=3.9.0"
#addin "nuget:?package=Cake.Incubator&version=5.0.1"
#addin "nuget:?package=Cake.Incubator&version=5.1.0"
#tool "nuget:?package=NUnit.ConsoleRunner&version=3.10.0"

///////////////////////////////////////////////////////////////////////////////
// ARGUMENTS
Expand Down
2 changes: 1 addition & 1 deletion build.version.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Major":1,"Minor":1,"Build":10,"PreRelease":1,"ReleaseNotes":["Added support for .NET Core"],"Semantic":null,"Milestone":null,"CakeVersion":"0.33.0.0","IsPreRelease":true}
{"Major":1,"Minor":1,"Build":10,"PreRelease":1,"ReleaseNotes":[],"Semantic":null,"Milestone":null,"CakeVersion":"0.33.0.0","IsPreRelease":true}
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<PropertyGroup>
<TargetFramework>net472</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.0" />
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="Serilog" Version="2.9.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions" Version="5.10.0" />
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="Serilog" Version="2.9.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Invisionware.Collections\Invisionware.Collections.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Invisionware.Collections\Invisionware.Collections.csproj" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions tools/settingsUtils.cake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#addin "nuget:?package=Cake.Json&version=3.0.1"
#addin "nuget:?package=Newtonsoft.Json&version=12.0.2"
#addin "nuget:?package=Cake.Json&version=4.0.0"
#addin "nuget:?package=Newtonsoft.Json&version=11.0.2"

using Newtonsoft.Json;

Expand Down
12 changes: 6 additions & 6 deletions tools/versionUtils.cake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#addin "nuget:?package=Cake.Json&version=3.0.1"
#addin "nuget:?package=Cake.FileHelpers&version=3.2.0"
#addin "nuget:?package=Newtonsoft.Json&version=12.0.2"
#tool "nuget:?package=GitVersion.CommandLine&version=4.0.0"
#addin "nuget:?package=Cake.Json&version=4.0.0"
#addin "nuget:?package=Newtonsoft.Json&version=11.0.2"
#addin "nuget:?package=Cake.FileHelpers&version=3.2.1"
#tool "nuget:?package=GitVersion.CommandLine&version=5.1.3"

using Newtonsoft.Json;

Expand Down Expand Up @@ -172,7 +172,7 @@ public class VersionUtils
{
context.Information("Updating Version File {0}", settings.Version.VersionFile);

context.SerializeJsonToFile(settings.Version.VersionFile, verInfo);
context.SerializeJsonToPrettyFile(settings.Version.VersionFile, verInfo);
}

if (!string.IsNullOrEmpty(settings.Version.AssemblyInfoFile) && context.FileExists(settings.Version.AssemblyInfoFile))
Expand Down Expand Up @@ -301,6 +301,6 @@ public class VersionInfo
context.Information("\tMilestone: {0}", Milestone);
context.Information("\tCake Version: {0}", CakeVersion);

if (ReleaseNotes != null) context.Information("\tRelease Notes: {0}", ReleaseNotes);
if (ReleaseNotes != null && ReleaseNotes.Length > 0) context.Information("\tRelease Notes: {0}", ReleaseNotes);
}
}

0 comments on commit 9257053

Please sign in to comment.