Skip to content

Commit

Permalink
[dotnet] netcoreapp3.1 is deprecated
Browse files Browse the repository at this point in the history
  • Loading branch information
titusfortner committed Jul 11, 2023
1 parent 5eced26 commit addaa5d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 12 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ci-dotnet.yml
Expand Up @@ -27,7 +27,6 @@ jobs:
framework:
- net48
- net6.0
- netcoreapp3.1
include:
- driver: Chrome
browser: chrome
Expand Down
Expand Up @@ -88,9 +88,6 @@ private string CurrentPlatform()
#if NET6_0
return "net6";
#endif
#if NETCOREAPP3_1
return "netcore3";
#endif
#if NET48
return "net48";
#endif
Expand Down
16 changes: 8 additions & 8 deletions dotnet/test/common/TakesScreenshotTest.cs
Expand Up @@ -69,7 +69,7 @@ public void GetScreenshotAsBinary()
[IgnoreBrowser(Browser.IE, "Color comparisons fail on IE")]
public void ShouldCaptureScreenshotOfCurrentViewport()
{
#if NETCOREAPP3_1 || NET6_0
#if NET6_0
Assert.Ignore("Skipping test: this framework can not process colors.");
#endif

Expand Down Expand Up @@ -97,7 +97,7 @@ public void ShouldCaptureScreenshotOfCurrentViewport()
[Test]
public void ShouldTakeScreenshotsOfAnElement()
{
#if NETCOREAPP3_1 || NET6_0
#if NET6_0
Assert.Ignore("Skipping test: this framework can not process colors.");
#endif

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

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

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

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

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

#if !NETCOREAPP3_1 && !NET6_0
#if !NET6_0
try
{
Image image = Image.FromStream(new MemoryStream(screenshot.AsByteArray));
Expand Down Expand Up @@ -357,7 +357,7 @@ private Color GetPixelColor(Screenshot screenshot, int x, int y)
{
Color pixelColor = Color.Black;

#if !NETCOREAPP3_1 && !NET6_0
#if !NET6_0
Image image = Image.FromStream(new MemoryStream(screenshot.AsByteArray));
Bitmap bitmap = new Bitmap(image);
pixelColor = bitmap.GetPixel(1, 1);
Expand Down

0 comments on commit addaa5d

Please sign in to comment.