Skip to content

Commit cde85b4

Browse files
russcamMpdreamz
authored andcommitted
Update ShellProgressBar in DNX solution
Remove namespace that causes exception in dotnet5.1 CodeGeneration project does not run from DNX (RazorMachine breaks when it attempts to find the path to referenced assemblies) Conflicts: paket.lock
1 parent 42b230b commit cde85b4

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

Diff for: paket.lock

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ NUGET
22
remote: http://api.nuget.org/v3/index.json
33
specs:
44
AsciiDocNet (1.0.0-alpha2)
5+
ShellProgressBar (3.0)
56
remote: https://www.nuget.org/api/v2
67
specs:
78
Bogus (3.0.5-beta-2)
@@ -350,9 +351,6 @@ NUGET
350351
System.Threading.Tasks (>= 4.0) - framework: dnxcore50
351352
xunit.abstractions (>= 2.0) - framework: dnxcore50
352353
xunit.extensibility.core (2.1) - framework: >= net45, dnx451, dnxcore50, monoandroid, monotouch, xamarinios, winv4.5, wpv8.0, wpav8.1
353-
remote: http://api.nuget.org/v3/index.json
354-
specs:
355-
ShellProgressBar (3.0)
356354

357355
GROUP build
358356
NUGET

Diff for: src/CodeGeneration/CodeGeneration.LowLevelClient/project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"CsQuery": "1.3.5-beta5",
99
"Newtonsoft.Json": "8.0.2",
1010
"RazorMachine": "2.6.1",
11-
"ShellProgressBar": "2.0.0.0"
11+
"ShellProgressBar": "3.0.0.0"
1212
},
1313
"commands": {
1414
"CodeGeneration.LowLevelClient": "CodeGeneration.LowLevelClient"

Diff for: src/Nest/Document/Multiple/ReindexOnServer/ReindexRouting.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using System.ServiceModel.Security;
32
using Newtonsoft.Json;
43

54
namespace Nest

0 commit comments

Comments
 (0)