Merge branch 'master' of https://github.com/ShareX/ShareX

2024-07-02 21:20:28 +12:00 · 2018-05-16 23:59:42 +09:00 · 2018-05-16 23:59:42 +09:00 · 94a4730b56
parent 2f6134d421 795822a7b2
commit 94a4730b56
16 changed files with 7 additions and 54 deletions
--- a/ShareX.DesktopBridgeHelper/ShareX.DesktopBridgeHelper.csproj
+++ b/ShareX.DesktopBridgeHelper/ShareX.DesktopBridgeHelper.csproj
@ -48,10 +48,5 @@
  <ItemGroup>
    <None Include="app.config" />
  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="StyleCop.Analyzers">
-      <Version>1.1.0-beta007</Version>
-    </PackageReference>
-  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
--- a/ShareX.HelpersLib/Helpers/ImageHelpers.cs
+++ b/ShareX.HelpersLib/Helpers/ImageHelpers.cs
@ -976,11 +976,11 @@ public static Bitmap Sharpen(Image img, double strength)

                    double[,] filter = new double[,]
                    {
-                        {-1, -1, -1, -1, -1},
-                        {-1,  2,  2,  2, -1},
-                        {-1,  2, 16,  2, -1},
-                        {-1,  2,  2,  2, -1},
-                        {-1, -1, -1, -1, -1}
+                        { -1, -1, -1, -1, -1 },
+                        { -1,  2,  2,  2, -1 },
+                        { -1,  2, 16,  2, -1 },
+                        { -1,  2,  2,  2, -1 },
+                        { -1, -1, -1, -1, -1 }
                    };

                    double bias = 1.0 - strength;
--- a/ShareX.HelpersLib/ShareX.HelpersLib.csproj
+++ b/ShareX.HelpersLib/ShareX.HelpersLib.csproj
@ -1312,9 +1312,6 @@
    <PackageReference Include="Newtonsoft.Json">
      <Version>11.0.2</Version>
    </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers">
-      <Version>1.1.0-beta007</Version>
-    </PackageReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
--- a/ShareX.HistoryLib/ShareX.HistoryLib.csproj
+++ b/ShareX.HistoryLib/ShareX.HistoryLib.csproj
@ -290,9 +290,6 @@
    <PackageReference Include="ImageListView">
      <Version>11.0.4</Version>
    </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers">
-      <Version>1.1.0-beta007</Version>
-    </PackageReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <PropertyGroup>
--- a/ShareX.ImageEffectsLib/ShareX.ImageEffectsLib.csproj
+++ b/ShareX.ImageEffectsLib/ShareX.ImageEffectsLib.csproj
@ -244,9 +244,6 @@
    <PackageReference Include="Newtonsoft.Json">
      <Version>11.0.2</Version>
    </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers">
-      <Version>1.1.0-beta007</Version>
-    </PackageReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
--- a/ShareX.IndexerLib/ShareX.IndexerLib.csproj
+++ b/ShareX.IndexerLib/ShareX.IndexerLib.csproj
@ -125,9 +125,6 @@
    <PackageReference Include="Newtonsoft.Json">
      <Version>11.0.2</Version>
    </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers">
-      <Version>1.1.0-beta007</Version>
-    </PackageReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
--- a/ShareX.MediaLib/ShareX.MediaLib.csproj
+++ b/ShareX.MediaLib/ShareX.MediaLib.csproj
@ -238,11 +238,6 @@
    <EmbeddedResource Include="Properties\Resources.zh-CN.resx" />
    <EmbeddedResource Include="Properties\Resources.zh-TW.resx" />
  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="StyleCop.Analyzers">
-      <Version>1.1.0-beta007</Version>
-    </PackageReference>
-  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
--- a/ShareX.NativeMessagingHost/ShareX.NativeMessagingHost.csproj
+++ b/ShareX.NativeMessagingHost/ShareX.NativeMessagingHost.csproj
@ -65,9 +65,6 @@
    <PackageReference Include="Newtonsoft.Json">
      <Version>11.0.2</Version>
    </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers">
-      <Version>1.1.0-beta007</Version>
-    </PackageReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
--- a/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
+++ b/ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
@ -579,9 +579,6 @@
    <PackageReference Include="ImageListView">
      <Version>11.0.4</Version>
    </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers">
-      <Version>1.1.0-beta007</Version>
-    </PackageReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
--- a/ShareX.Setup/ShareX.Setup.csproj
+++ b/ShareX.Setup/ShareX.Setup.csproj
@ -92,11 +92,6 @@
      <Name>ShareX.HelpersLib</Name>
    </ProjectReference>
  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="StyleCop.Analyzers">
-      <Version>1.1.0-beta007</Version>
-    </PackageReference>
-  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
--- a/ShareX.Steam/ShareX.Steam.csproj
+++ b/ShareX.Steam/ShareX.Steam.csproj
@ -74,11 +74,6 @@
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="StyleCop.Analyzers">
-      <Version>1.1.0-beta007</Version>
-    </PackageReference>
-  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
--- a/ShareX.UploadersLib/FileUploaders/Pomf.cs
+++ b/ShareX.UploadersLib/FileUploaders/Pomf.cs
@ -189,4 +189,4 @@ public override string ToString()
            }
        }
    }
-}
+}
--- a/ShareX.UploadersLib/ImageUploaders/Chevereto.cs
+++ b/ShareX.UploadersLib/ImageUploaders/Chevereto.cs
@ -220,4 +220,4 @@ public override string ToString()
            }
        }
    }
-}
+}
--- a/ShareX.UploadersLib/ShareX.UploadersLib.csproj
+++ b/ShareX.UploadersLib/ShareX.UploadersLib.csproj
@ -964,9 +964,6 @@
    <PackageReference Include="SSH.NET">
      <Version>2016.1.0</Version>
    </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers">
-      <Version>1.1.0-beta007</Version>
-    </PackageReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <PropertyGroup>
--- a/ShareX.sln
+++ b/ShareX.sln
@ -155,9 +155,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		RESX_ShowErrorsInErrorList = False
-		RESX_AutoCreateNewLanguageFiles = True
-		RESX_ConfirmAddLanguageFile = False
 		SolutionGuid = {DEACF1C2-28EE-44DF-B55E-2234F6137272}
 	EndGlobalSection
 EndGlobal
--- a/ShareX/ShareX.csproj
+++ b/ShareX/ShareX.csproj
@ -1559,9 +1559,6 @@
    <PackageReference Include="Newtonsoft.Json">
      <Version>11.0.2</Version>
    </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers">
-      <Version>1.1.0-beta007</Version>
-    </PackageReference>
    <PackageReference Include="ZXing.Net">
      <Version>0.16.4</Version>
    </PackageReference>