Skip to content

Commit 31736e4

Browse files
committed
CI compilation issues after merge with main
1 parent 6ae7d1b commit 31736e4

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

test/IntegrationTests/WcfCoreServerTestHelper.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88

99
namespace IntegrationTests;
1010

11+
#pragma warning disable CA1812 // Mark members as static. There is some issue in dotnet format.
12+
// TODO remove pragma when dotnet format issue is fixed
1113
internal sealed class WcfCoreServerTestHelper : WcfServerTestHelperBase
14+
#pragma warning restore CA1812 // Mark members as static. There is some issue in dotnet format.
1215
{
1316
private readonly string _packageVersion;
1417

test/IntegrationTests/WcfDotNetTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public WcfDotNetTests(ITestOutputHelper output)
1313
{
1414
}
1515

16-
public static TheoryData<string, Func<ITestOutputHelper, WcfServerTestHelperBase>> GetData()
16+
public static TheoryData<string, Func<ITestOutputHelper, WcfServerTestHelperBase>> TestData()
1717
{
1818
var theoryData = new TheoryData<string, Func<ITestOutputHelper, WcfServerTestHelperBase>>();
1919

@@ -34,7 +34,7 @@ public static TheoryData<string, Func<ITestOutputHelper, WcfServerTestHelperBase
3434

3535
[Trait("Category", "EndToEnd")]
3636
[Theory]
37-
[MemberData(nameof(GetData))]
37+
[MemberData(nameof(TestData))]
3838
public async Task SubmitTraces(string clientPackageVersion, Func<ITestOutputHelper, WcfServerTestHelperBase> wcfServerTestHelperFactory)
3939
{
4040
Assert.NotNull(wcfServerTestHelperFactory);

test/IntegrationTests/WcfServerTestHelper.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4+
#if _WINDOWS
5+
46
using IntegrationTests.Helpers;
57
using Xunit.Abstractions;
68

@@ -31,3 +33,4 @@ internal override ProcessHelper RunWcfServer(MockSpansCollector collector)
3133
return new ProcessHelper(process);
3234
}
3335
}
36+
#endif

0 commit comments

Comments
 (0)