Skip to content

Commit 49764cd

Browse files
committed
post cherry-pick build fixes, made sure the our transient deps are up to date
1 parent 9b342e1 commit 49764cd

File tree

9 files changed

+3155
-1144
lines changed

9 files changed

+3155
-1144
lines changed

paket.dependencies

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,20 @@ nuget Microsoft.CodeAnalysis.CSharp
88
nuget CsQuery
99
nuget RazorMachine 2.6.1
1010
nuget System.Collections.Immutable
11-
nuget System.Reflection.Metadata 1.2.0
11+
nuget System.Reflection.Metadata
1212

1313
//tests
1414
nuget FluentAssertions
1515
nuget Bogus
1616
nuget DiffPlex
1717
nuget SemanticVersioning
18+
nuget System.Reactive
1819

1920
// profiling / benchmarking
2021
nuget JetBrains.Profiler.Kernel.Windows.Api
2122
nuget Humanizer
2223
nuget NDesk.Options
2324

24-
nuget System.Reactive
25-
nuget SemanticVersioning
26-
2725
source https://api.nuget.org/v3/index.json
2826

2927
nuget AsciiDocNet
@@ -41,4 +39,4 @@ group build
4139
nuget GitLink prerelease
4240

4341
source https://www.myget.org/F/xunit/
44-
nuget xunit.runner.console 2.2.0-beta3-build3330
42+
nuget xunit.runner.console 2.2.0-beta3-build3330

paket.lock

Lines changed: 723 additions & 610 deletions
Large diffs are not rendered by default.

src/Benchmarking/Benchmarking.csproj

Lines changed: 303 additions & 78 deletions
Large diffs are not rendered by default.

src/CodeGeneration/ApiGenerator/ApiGenerator.csproj

Lines changed: 160 additions & 12 deletions
Large diffs are not rendered by default.

src/CodeGeneration/DocGenerator/DocGenerator.csproj

Lines changed: 1055 additions & 167 deletions
Large diffs are not rendered by default.

src/Nest/Nest.csproj

Lines changed: 170 additions & 12 deletions
Large diffs are not rendered by default.

src/Profiling/Profiling.csproj

Lines changed: 308 additions & 63 deletions
Large diffs are not rendered by default.

src/Tests/Framework/TestAttributes.cs

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,11 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4-
#if !DOTNETCORE
5-
using SemVer;
6-
#endif
74
using Xunit;
85
using Xunit.Abstractions;
96
using Xunit.Sdk;
107
using System.Reflection;
11-
12-
#if DOTNETCORE
13-
namespace SemVer
14-
{
15-
//TODO incredibly ugly but on .net core we always skip tests marked with SkipVersion
16-
//We'll need to submit a PR to https://github.com/adamreeve/semver.net once .net core is
17-
//in more stable waters
18-
19-
public class Range
20-
{
21-
private string _range;
22-
public Range(string range)
23-
{
24-
this._range = range;
25-
}
26-
//if a test has a skip range skip alwyas on CoreCLR since we can not as of yet
27-
//validate ranges
28-
public bool IsSatisfied(SemVer.Version version) => this._range != null;
29-
}
30-
public class Version
31-
{
32-
public string Parsed { get; }
33-
public Version(string version)
34-
{
35-
this.Parsed = version;
36-
}
37-
}
38-
}
39-
#endif
8+
using Version = SemVer.Version;
409

4110
namespace Tests.Framework
4211
{
@@ -88,7 +57,7 @@ protected override bool SkipMethod(ITestFrameworkDiscoveryOptions discoveryOptio
8857
#endif
8958
if (!attributes.Any()) return false;
9059

91-
var version = new SemVer.Version(TestClient.Configuration.ElasticsearchVersion);
60+
var version = new Version(TestClient.Configuration.ElasticsearchVersion);
9261
var ranges = attributes.Cast<SkipVersionAttribute>()
9362
.SelectMany(a=>a.Ranges);
9463

src/Tests/Tests.csproj

Lines changed: 431 additions & 164 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)