Skip to content

Commit 1206a9c

Browse files
committed
remove excluded file that tripped up the .net core build
1 parent f223038 commit 1206a9c

File tree

4 files changed

+10
-120
lines changed

4 files changed

+10
-120
lines changed

src/Nest/CommonAbstractions/SerializationBehavior/JsonNetSerializer.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,9 @@ private JsonSerializerSettings CreateSettings(SerializationFormatting formatting
138138
NullValueHandling = NullValueHandling.Ignore
139139
};
140140

141+
#pragma warning disable CS0618 // Type or member is obsolete
141142
this.ModifyJsonSerializerSettings(settings);
143+
#pragma warning restore CS0618 // Type or member is obsolete
142144

143145
var contract = settings.ContractResolver as ElasticContractResolver;
144146
if (contract == null) throw new Exception($"NEST needs an instance of {nameof(ElasticContractResolver)} registered on Json.NET's JsonSerializerSettings");

src/Tests/ClientConcepts/LowLevel/Connecting.doc.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,9 @@ public MyJsonNetSerializer(IConnectionSettingsValues settings) : base(settings)
297297

298298
public int CallToModify { get; set; } = 0;
299299

300+
#pragma warning disable CS0672 // Member overrides obsolete member
300301
protected override void ModifyJsonSerializerSettings(JsonSerializerSettings settings) => ++CallToModify; //<1> Override ModifyJsonSerializerSettings if you need access to `JsonSerializerSettings`
302+
#pragma warning restore CS0672 // Member overrides obsolete member
301303

302304
public int CallToContractConverter { get; set; } = 0;
303305

@@ -319,7 +321,9 @@ public MyJsonNetSerializer(IConnectionSettingsValues settings) : base(settings)
319321
public void ModifyJsonSerializerSettingsIsCalled()
320322
{
321323
var connectionPool = new SingleNodeConnectionPool(new Uri("http://localhost:9200"));
324+
#pragma warning disable CS0618 // Type or member is obsolete
322325
var settings = new ConnectionSettings(connectionPool, new InMemoryConnection(), s => new MyJsonNetSerializer(s));
326+
#pragma warning restore CS0618 // Type or member is obsolete
323327
var client = new ElasticClient(settings);
324328
client.RootNodeInfo();
325329
client.RootNodeInfo();

src/Tests/ClientConcepts/Serializer/FactorySerializerCallCountTests.cs

Lines changed: 0 additions & 118 deletions
This file was deleted.

src/Tests/Framework/TestClient.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,10 @@ public static ConnectionSettings CreateSettings(
7676
Func<ConnectionSettings, IElasticsearchSerializer> serializerFactory = null
7777
)
7878
{
79-
createPool = createPool ?? (u => new SingleNodeConnectionPool(u));
80-
var defaultSettings = DefaultSettings(new ConnectionSettings(createPool(CreateUri(port)), CreateConnection(forceInMemory: forceInMemory), serializerFactory));
79+
createPool = createPool ?? (u => new SingleNodeConnectionPool(u));
80+
#pragma warning disable CS0618 // Type or member is obsolete
81+
var defaultSettings = DefaultSettings(new ConnectionSettings(createPool(CreateUri(port)), CreateConnection(forceInMemory: forceInMemory), serializerFactory));
82+
#pragma warning restore CS0618 // Type or member is obsolete
8183
var settings = modifySettings != null ? modifySettings(defaultSettings) : defaultSettings;
8284
return settings;
8385
}

0 commit comments

Comments
 (0)