Skip to content

Commit 15d54e8

Browse files
author
ENDAVA\mzorec
committed
fixed issues with nuget packages version mismatches.
1 parent 85e36c9 commit 15d54e8

File tree

5 files changed

+7
-10
lines changed

5 files changed

+7
-10
lines changed

src/Build.csproj

+2-5
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,8 @@
141141
<Compile Include="BuildScript.cs" Exclude="**;bin\**;obj\**;**\*.xproj;packages\**" />
142142
</ItemGroup>
143143
<ItemGroup>
144-
<DotNetCliToolReference Include="dotnet-flubu" Version="5.1.8" />
145-
</ItemGroup>
146-
<ItemGroup>
147-
<PackageReference Include="FlubuCore" Version="5.1.8" />
148-
<PackageReference Include="LiteDB" Version="5.0.11" />
144+
<PackageReference Include="FlubuCore" Version="7.0.1" />
145+
<PackageReference Include="LiteDB" Version="5.0.17" />
149146
</ItemGroup>
150147
<ItemGroup>
151148
<Content Include="..\CHANGELOG.md">

src/BuildScript/BuildScript.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ protected override void ConfigureTargets(ITaskContext context)
106106
.SetAsDefault()
107107
.DependsOn(compile, flubuTests);
108108

109-
var branch = context.BuildSystems().AppVeyor().BranchName;
109+
var branch = context.BuildServers().AppVeyor().BranchName;
110110

111111
context.CreateTarget("rebuild.server")
112112
.SetDescription("Rebuilds the solution and publishes nuget packages.")
@@ -118,7 +118,7 @@ protected override void ConfigureTargets(ITaskContext context)
118118
.DependsOn(packageDotnetFlubu)
119119
.DependsOn(packageWebApi)
120120
.DependsOn(nugetPublish).When((c) =>
121-
c.BuildSystems().RunningOn == BuildSystemType.AppVeyor && branch != null && branch.Contains("stable", StringComparison.OrdinalIgnoreCase));
121+
c.BuildServers().RunningOn == BuildServerType.AppVeyor && branch != null && branch.Contains("stable", StringComparison.OrdinalIgnoreCase));
122122
////.DependsOn(packageWebApiWin);
123123

124124
var compileLinux = context

src/Deploy/Deploy.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</ItemGroup>
1111
<ItemGroup>
1212

13-
<PackageReference Include="LiteDB" Version="5.0.11" />
13+
<PackageReference Include="LiteDB" Version="5.0.17" />
1414
</ItemGroup>
1515
<ItemGroup>
1616
<ProjectReference Include="..\FlubuCore.LiteDb\FlubuCore.LiteDb.csproj" />

src/FlubuCore/FlubuCore.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
7171
<PackageReference Include="Microsoft.Web.Administration" Version="11.1.0" />
7272
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
73-
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
73+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
7474
<PackageReference Include="SSH.NET" Version="2020.0.2" />
7575
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
7676
<PrivateAssets>All</PrivateAssets>

src/FlubuCore/Tasks/Linux/SystemCtlTask.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ protected override int DoExecute(ITaskContextInternal context)
3333

3434
if (DoNotFail)
3535
task.DoNotFailOnError();
36-
36+
3737
if (!string.IsNullOrEmpty(_host))
3838
task.WithArguments("-H", _host);
3939

0 commit comments

Comments
 (0)