Skip to content

Commit fe7aa1e

Browse files
committed
DNX build failure fixes
- File.IO needed to be referenced now that we have an API around reading a license file from disk - ifdef reading a license location from env variables in dotnetcore
1 parent 2102284 commit fe7aa1e

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

src/Nest/project.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@
108108
},
109109
"dependencies": {
110110
"System.Collections": "4.0.11-beta-23225",
111+
"System.IO.FileSystem": "4.0.1-beta-23225",
111112
"System.Diagnostics.Tools": "4.0.1-beta-23225",
112113
"System.Dynamic.Runtime": "4.0.11-beta-23516",
113114
"System.Linq": "4.0.0-beta-23109",

src/Tests/Framework/Integration/Process/ElasticsearchNode.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,11 @@ private void ValidateLicense()
254254
if (license.IsValid && license.License.Status == LicenseStatus.Active) return;
255255

256256
var exceptionMessageStart = "Server has license plugin installed, ";
257+
#if DOTNETCORE
258+
var licenseFile = string.Empty;
259+
#else
257260
var licenseFile = Environment.GetEnvironmentVariable("ES_LICENSE_FILE", EnvironmentVariableTarget.Machine);
261+
#endif
258262
if (!string.IsNullOrWhiteSpace(licenseFile))
259263
{
260264
var putLicense = client.PostLicense(new PostLicenseRequest { License = License.LoadFromDisk(licenseFile) });

0 commit comments

Comments
 (0)