Skip to content

Commit addaa5d

Browse files
committed
[dotnet] netcoreapp3.1 is deprecated
1 parent 5eced26 commit addaa5d

3 files changed

Lines changed: 8 additions & 12 deletions

File tree

.github/workflows/ci-dotnet.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ jobs:
2727
framework:
2828
- net48
2929
- net6.0
30-
- netcoreapp3.1
3130
include:
3231
- driver: Chrome
3332
browser: chrome

dotnet/test/common/CustomTestAttributes/IgnoreTargetAttribute.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@ private string CurrentPlatform()
8888
#if NET6_0
8989
return "net6";
9090
#endif
91-
#if NETCOREAPP3_1
92-
return "netcore3";
93-
#endif
9491
#if NET48
9592
return "net48";
9693
#endif

dotnet/test/common/TakesScreenshotTest.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void GetScreenshotAsBinary()
6969
[IgnoreBrowser(Browser.IE, "Color comparisons fail on IE")]
7070
public void ShouldCaptureScreenshotOfCurrentViewport()
7171
{
72-
#if NETCOREAPP3_1 || NET6_0
72+
#if NET6_0
7373
Assert.Ignore("Skipping test: this framework can not process colors.");
7474
#endif
7575

@@ -97,7 +97,7 @@ public void ShouldCaptureScreenshotOfCurrentViewport()
9797
[Test]
9898
public void ShouldTakeScreenshotsOfAnElement()
9999
{
100-
#if NETCOREAPP3_1 || NET6_0
100+
#if NET6_0
101101
Assert.Ignore("Skipping test: this framework can not process colors.");
102102
#endif
103103

@@ -124,7 +124,7 @@ public void ShouldTakeScreenshotsOfAnElement()
124124
[IgnoreBrowser(Browser.IE, "Color comparisons fail on IE")]
125125
public void ShouldCaptureScreenshotAtFramePage()
126126
{
127-
#if NETCOREAPP3_1 || NET6_0
127+
#if NET6_0
128128
Assert.Ignore("Skipping test: this framework can not process colors.");
129129
#endif
130130

@@ -167,7 +167,7 @@ public void ShouldCaptureScreenshotAtFramePage()
167167
[IgnoreBrowser(Browser.IE, "Color comparisons fail on IE")]
168168
public void ShouldCaptureScreenshotAtIFramePage()
169169
{
170-
#if NETCOREAPP3_1 || NET6_0
170+
#if NET6_0
171171
Assert.Ignore("Skipping test: this framework can not process colors.");
172172
#endif
173173

@@ -208,7 +208,7 @@ public void ShouldCaptureScreenshotAtIFramePage()
208208
[IgnoreBrowser(Browser.Firefox, "Color comparisons fail on Firefox")]
209209
public void ShouldCaptureScreenshotAtFramePageAfterSwitching()
210210
{
211-
#if NETCOREAPP3_1 || NET6_0
211+
#if NET6_0
212212
Assert.Ignore("Skipping test: this framework can not process colors.");
213213
#endif
214214

@@ -247,7 +247,7 @@ public void ShouldCaptureScreenshotAtFramePageAfterSwitching()
247247
[IgnoreBrowser(Browser.Firefox, "Color comparisons fail on Firefox")]
248248
public void ShouldCaptureScreenshotAtIFramePageAfterSwitching()
249249
{
250-
#if NETCOREAPP3_1 || NET6_0
250+
#if NET6_0
251251
Assert.Ignore("Skipping test: this framework can not process colors.");
252252
#endif
253253

@@ -323,7 +323,7 @@ private HashSet<string> ScanActualColors(Screenshot screenshot, int stepX, int s
323323
{
324324
HashSet<string> colors = new HashSet<string>();
325325

326-
#if !NETCOREAPP3_1 && !NET6_0
326+
#if !NET6_0
327327
try
328328
{
329329
Image image = Image.FromStream(new MemoryStream(screenshot.AsByteArray));
@@ -357,7 +357,7 @@ private Color GetPixelColor(Screenshot screenshot, int x, int y)
357357
{
358358
Color pixelColor = Color.Black;
359359

360-
#if !NETCOREAPP3_1 && !NET6_0
360+
#if !NET6_0
361361
Image image = Image.FromStream(new MemoryStream(screenshot.AsByteArray));
362362
Bitmap bitmap = new Bitmap(image);
363363
pixelColor = bitmap.GetPixel(1, 1);

0 commit comments

Comments
 (0)