Skip to content

Commit 0c6646f

Browse files
HirogenHirogen
authored
Merge pull request #216 from Hirogen/master
updated the nuget packages to use newer versions
2 parents 7f84bf6 + de6209b commit 0c6646f

File tree

19 files changed

+191
-172
lines changed

19 files changed

+191
-172
lines changed

‎GitVersion.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
assembly-versioning-scheme: MajorMinorPatchTag
2+
mode: ContinuousDelivery
3+
branches: {}
4+
ignore:
5+
sha: []
6+
merge-message-formats: {}

‎appveyor.gitversion.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
install:
2+
- choco install gitversion.portable -pre -y
3+
4+
before_build:
5+
- nuget restore
6+
- ps: gitversion /l console /output buildserver /updateAssemblyInfo
7+
8+
build:
9+
project: scr\LogExpert.sln

‎build/Build.cs‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@
55
using System.Text.RegularExpressions;
66
using System.Threading.Tasks;
77
using JetBrains.Annotations;
8+
using Nuke.Common.Tools.DotCover;
9+
using Nuke.Common.Tools.ReportGenerator;
810
using Microsoft.Build.Execution;
911
using Nuke.Common;
10-
using Nuke.Common.BuildServers;
12+
using Nuke.Common.CI.AppVeyor;
13+
using Nuke.Common.CI.AppVeyor.Configuration;
1114
using Nuke.Common.Execution;
1215
using Nuke.Common.Git;
1316
using Nuke.Common.IO;
@@ -18,12 +21,10 @@
1821
using Nuke.Common.Tools.GitVersion;
1922
using Nuke.Common.Tools.NuGet;
2023
using Nuke.Common.Tools.NUnit;
21-
using Nuke.Common.Utilities;
2224
using Nuke.Common.Utilities.Collections;
2325
using Nuke.GitHub;
2426
using static Nuke.Common.EnvironmentInfo;
2527
using static Nuke.Common.IO.FileSystemTasks;
26-
using static Nuke.Common.IO.PathConstruction;
2728
using static Nuke.Common.Tools.MSBuild.MSBuildTasks;
2829
using static Nuke.Common.Tools.DotNet.DotNetTasks;
2930
using static Nuke.Common.IO.TextTasks;
@@ -42,11 +43,13 @@ class Build : NukeBuild
4243
/// - Microsoft VSCode https://nuke.build/vscode
4344
public static int Main() => Execute<Build>(x => x.Test);
4445

45-
[Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")] private readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
46+
[Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
47+
readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
4648

4749
[Solution] readonly Solution Solution;
4850
[GitRepository] readonly GitRepository GitRepository;
49-
[GitVersion] readonly GitVersion GitVersion;
51+
[GitVersion(UpdateBuildNumber = true)]
52+
readonly Nuke.Common.Tools.GitVersion.GitVersion GitVersion;
5053

5154
AbsolutePath SourceDirectory => RootDirectory / "src";
5255

@@ -80,15 +83,16 @@ Version Version
8083
patch = AppVeyor.Instance.BuildNumber;
8184
}
8285

83-
return new Version(1, 8, patch);
86+
return new Version(1, 8, 8, patch);
8487
}
8588
}
8689

8790
[Parameter("Version string")]
8891
string VersionString => $"{Version.Major}.{Version.Minor}.{Version.Build}";
8992

9093
[Parameter("Version Information string")]
91-
string VersionInformationString => $"{VersionString}.Branch.{GitVersion.BranchName}.{GitVersion.Sha} {Configuration}";
94+
//.Branch.{GitVersion.BranchName}.{GitVersion.Sha} removed for testing purpose
95+
string VersionInformationString => $"{VersionString} {Configuration}";
9296

9397
[Parameter("Version file string")]
9498
string VersionFileString => $"{Version.Major}.{Version.Minor}.0";

‎build/Configuration/Configuration.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
using System.ComponentModel;
2+
3+
using Nuke.Common.Tooling;
4+
5+
[TypeConverter(typeof(TypeConverter<Configuration>))]
6+
public class Configuration : Enumeration
7+
{
8+
public static Configuration Debug = new Configuration { Value = nameof(Debug) };
9+
public static Configuration Release = new Configuration { Value = nameof(Release) };
10+
11+
public static implicit operator string(Configuration configuration)
12+
{
13+
return configuration.Value;
14+
}
15+
}

‎build/_build.csproj‎

Lines changed: 49 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,51 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.0</TargetFramework>
6-
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
7-
<RootNamespace></RootNamespace>
8-
<IsPackable>False</IsPackable>
9-
<NoWarn>CS0649;CS0169</NoWarn>
10-
</PropertyGroup>
11-
12-
<ItemGroup>
13-
<PackageReference Include="chocolatey" Version="0.10.14" />
14-
<PackageReference Include="GitVersion.CommandLine.DotNetCore" Version="5.0.1">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
6+
7+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
8+
<RootNamespace></RootNamespace>
9+
<IsPackable>False</IsPackable>
10+
<NoWarn>CS0649;CS0169</NoWarn>
11+
</PropertyGroup>
12+
13+
<ItemGroup>
14+
<PackageReference Include="chocolatey" Version="1.0.1" />
15+
<PackageReference Include="GitVersion.CommandLine" Version="5.9.0">
16+
<PrivateAssets>all</PrivateAssets>
17+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18+
</PackageReference>
19+
<PackageReference Include="GitVersion.Core" Version="5.9.0" />
20+
<PackageReference Include="NuGet.CommandLine" Version="6.0.0">
1521
<PrivateAssets>all</PrivateAssets>
1622
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
17-
</PackageReference>
18-
<PackageReference Include="NuGet.CommandLine" Version="5.2.0">
19-
<PrivateAssets>all</PrivateAssets>
20-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
21-
</PackageReference>
22-
<PackageReference Include="Nuke.Common" Version="0.21.2" />
23-
<PackageReference Include="Nuke.GitHub" Version="1.5.0" />
24-
<PackageReference Include="NUnit.ConsoleRunner" Version="3.10.0" />
25-
</ItemGroup>
26-
27-
<ItemGroup>
28-
<NukeMetadata Include="**\*.json" Exclude="bin\**;obj\**" />
29-
<NukeExternalFiles Include="**\*.*.ext" Exclude="bin\**;obj\**" />
30-
<None Remove="*.csproj.DotSettings;*.ref.*.txt" />
31-
<None Include="..\appveyor-release.yml" Link="appveyor-release.yml" />
32-
<None Include="..\Build-DebugPack.ps1" Link="Build-DebugPack.ps1" />
33-
<None Include="..\Build-ReleasePack.ps1" Link="Build-ReleasePack.ps1" />
34-
35-
<!-- Common build related files -->
36-
<None Include="..\build.ps1" />
37-
<None Include="..\build.sh" />
38-
<None Include="..\.nuke" />
39-
<None Include="..\global.json" Condition="Exists('..\global.json')" />
40-
<None Include="..\nuget.config" Condition="Exists('..\nuget.config')" />
41-
<None Include="..\azure-pipelines.yml" Condition="Exists('..\azure-pipelines.yml')" />
42-
<None Include="..\Jenkinsfile" Condition="Exists('..\Jenkinsfile')" />
43-
<None Include="..\appveyor.yml" Condition="Exists('..\appveyor.yml')" />
44-
<None Include="..\.travis.yml" Condition="Exists('..\.travis.yml')" />
45-
<None Include="..\GitVersion.yml" Condition="Exists('..\GitVersion.yml')" />
46-
</ItemGroup>
47-
48-
</Project>
23+
</PackageReference>
24+
<PackageReference Include="Nuke.Common" Version="5.0.0" />
25+
<PackageReference Include="Nuke.GitHub" Version="1.5.0" />
26+
<PackageReference Include="NUnit.ConsoleRunner" Version="3.15.0" />
27+
</ItemGroup>
28+
29+
<ItemGroup>
30+
<NukeMetadata Include="**\*.json" Exclude="bin\**;obj\**" />
31+
<NukeExternalFiles Include="**\*.*.ext" Exclude="bin\**;obj\**" />
32+
<None Remove="*.csproj.DotSettings;*.ref.*.txt" />
33+
<None Include="..\appveyor-release.yml" Link="appveyor-release.yml" />
34+
<None Include="..\appveyor.gitversion.yml" Link="appveyor.gitversion.yml" />
35+
<None Include="..\Build-DebugPack.ps1" Link="Build-DebugPack.ps1" />
36+
<None Include="..\Build-ReleasePack.ps1" Link="Build-ReleasePack.ps1" />
37+
38+
<!-- Common build related files -->
39+
<None Include="..\build.ps1" />
40+
<None Include="..\build.sh" />
41+
<None Include="..\.nuke" />
42+
<None Include="..\global.json" Condition="Exists('..\global.json')" />
43+
<None Include="..\nuget.config" Condition="Exists('..\nuget.config')" />
44+
<None Include="..\azure-pipelines.yml" Condition="Exists('..\azure-pipelines.yml')" />
45+
<None Include="..\Jenkinsfile" Condition="Exists('..\Jenkinsfile')" />
46+
<None Include="..\appveyor.yml" Condition="Exists('..\appveyor.yml')" />
47+
<None Include="..\.travis.yml" Condition="Exists('..\.travis.yml')" />
48+
<None Include="..\GitVersion.yml" Condition="Exists('..\GitVersion.yml')" />
49+
</ItemGroup>
50+
51+
</Project>

‎src/ColumnizerLib.UnitTests/ColumnizerLib.UnitTests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@
5959
</ItemGroup>
6060
<ItemGroup>
6161
<PackageReference Include="NUnit">
62-
<Version>3.12.0</Version>
62+
<Version>3.13.3</Version>
6363
</PackageReference>
6464
<PackageReference Include="NUnit3TestAdapter">
65-
<Version>3.15.1</Version>
65+
<Version>4.2.1</Version>
6666
</PackageReference>
6767
</ItemGroup>
6868
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎src/JsonColumnizer/JsonColumnizer.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
</ItemGroup>
7373
<ItemGroup>
7474
<PackageReference Include="Newtonsoft.Json">
75-
<Version>12.0.2</Version>
75+
<Version>13.0.1</Version>
7676
</PackageReference>
7777
</ItemGroup>
7878
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎src/JsonCompactColumnizer/JsonCompactColumnizer.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
</ItemGroup>
7777
<ItemGroup>
7878
<PackageReference Include="Newtonsoft.Json">
79-
<Version>12.0.2</Version>
79+
<Version>13.0.1</Version>
8080
</PackageReference>
8181
</ItemGroup>
8282
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎src/LogExpert.Tests/LogExpert.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@
6363
</ItemGroup>
6464
<ItemGroup>
6565
<PackageReference Include="Moq">
66-
<Version>4.13.0</Version>
66+
<Version>4.17.2</Version>
6767
</PackageReference>
6868
<PackageReference Include="NUnit">
69-
<Version>3.12.0</Version>
69+
<Version>3.13.3</Version>
7070
</PackageReference>
7171
<PackageReference Include="NUnit3TestAdapter">
72-
<Version>3.15.1</Version>
72+
<Version>4.2.1</Version>
7373
</PackageReference>
7474
</ItemGroup>
7575
<ItemGroup>

0 commit comments

Comments
 (0)