From 3f5810bfdb6470a40b5feab57a907a2295f6d78a Mon Sep 17 00:00:00 2001
From: Arjun Balgovind <32061677+arjunbalgovind@users.noreply.github.com>
Date: Thu, 22 Oct 2020 17:28:25 -0700
Subject: [PATCH] [Fix Build farm]Fix ImageResizer Loc and change C# language
version in ColorPicker to 8.0 (#7483)
* Removed duplicate resx addition
* Changed version to 8.0
---
UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj | 2 +-
src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj | 4 ++--
src/modules/colorPicker/ColorPickerUI/Helpers/ColorHelper.cs | 2 +-
src/modules/imageresizer/ui/ImageResizerUI.csproj | 1 -
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj b/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj
index c30008a5ac..041eed126e 100644
--- a/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj
+++ b/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj
@@ -5,7 +5,7 @@
UnitTest_ColorPickerUI
false
enable
- 9.0
+ 8.0
Library
diff --git a/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj b/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj
index ae47ea9fdc..3eef221bc0 100644
--- a/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj
+++ b/src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj
@@ -62,7 +62,7 @@
DEBUG;TRACE
full
x64
- 9.0
+ 8.0
prompt
MinimumRecommendedRules.ruleset
true
@@ -73,7 +73,7 @@
true
pdbonly
x64
- 9.0
+ 8.0
prompt
MinimumRecommendedRules.ruleset
true
diff --git a/src/modules/colorPicker/ColorPickerUI/Helpers/ColorHelper.cs b/src/modules/colorPicker/ColorPickerUI/Helpers/ColorHelper.cs
index 0c528b7755..44f547fc5b 100644
--- a/src/modules/colorPicker/ColorPickerUI/Helpers/ColorHelper.cs
+++ b/src/modules/colorPicker/ColorPickerUI/Helpers/ColorHelper.cs
@@ -28,7 +28,7 @@ namespace ColorPicker.Helpers
{
return (color.GetHue(), 0d, lightness);
}
- else if (lightness is > 0d and <= 0.5d)
+ else if (lightness > 0d && lightness <= 0.5d)
{
return (color.GetHue(), (max - min) / (max + min), lightness);
}
diff --git a/src/modules/imageresizer/ui/ImageResizerUI.csproj b/src/modules/imageresizer/ui/ImageResizerUI.csproj
index e94aa10651..58cfebf3b8 100644
--- a/src/modules/imageresizer/ui/ImageResizerUI.csproj
+++ b/src/modules/imageresizer/ui/ImageResizerUI.csproj
@@ -50,7 +50,6 @@
Resources.Designer.cs
Designer
-