CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-03 02:36:50 +13:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
joohyungbyun 2018-05-16 23:59:42 +09:00
commit 94a4730b56
16 changed files with 7 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ShareX.DesktopBridgeHelper/ShareX.DesktopBridgeHelper.csproj
View file

@ -48,10 +48,5 @@
<ItemGroup> <ItemGroup>
<None Include="app.config" /> <None Include="app.config" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="StyleCop.Analyzers">
<Version>1.1.0-beta007</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>

10
ShareX.HelpersLib/Helpers/ImageHelpers.cs
View file

@ -976,11 +976,11 @@ public static Bitmap Sharpen(Image img, double strength)
double[,] filter = new double[,] double[,] filter = new double[,]
{ {
{-1, -1, -1, -1, -1}, { -1, -1, -1, -1, -1 },
{-1, 2, 2, 2, -1}, { -1, 2, 2, 2, -1 },
{-1, 2, 16, 2, -1}, { -1, 2, 16, 2, -1 },
{-1, 2, 2, 2, -1}, { -1, 2, 2, 2, -1 },
{-1, -1, -1, -1, -1} { -1, -1, -1, -1, -1 }
}; };
double bias = 1.0 - strength; double bias = 1.0 - strength;

3
ShareX.HelpersLib/ShareX.HelpersLib.csproj
View file

@ -1312,9 +1312,6 @@
<PackageReference Include="Newtonsoft.Json"> <PackageReference Include="Newtonsoft.Json">
<Version>11.0.2</Version> <Version>11.0.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="StyleCop.Analyzers">
<Version>1.1.0-beta007</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

3
ShareX.HistoryLib/ShareX.HistoryLib.csproj
View file

@ -290,9 +290,6 @@
<PackageReference Include="ImageListView"> <PackageReference Include="ImageListView">
<Version>11.0.4</Version> <Version>11.0.4</Version>
</PackageReference> </PackageReference>
<PackageReference Include="StyleCop.Analyzers">
<Version>1.1.0-beta007</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>

3
ShareX.ImageEffectsLib/ShareX.ImageEffectsLib.csproj
View file

@ -244,9 +244,6 @@
<PackageReference Include="Newtonsoft.Json"> <PackageReference Include="Newtonsoft.Json">
<Version>11.0.2</Version> <Version>11.0.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="StyleCop.Analyzers">
<Version>1.1.0-beta007</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

3
ShareX.IndexerLib/ShareX.IndexerLib.csproj
View file

@ -125,9 +125,6 @@
<PackageReference Include="Newtonsoft.Json"> <PackageReference Include="Newtonsoft.Json">
<Version>11.0.2</Version> <Version>11.0.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="StyleCop.Analyzers">
<Version>1.1.0-beta007</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

5
ShareX.MediaLib/ShareX.MediaLib.csproj
View file

@ -238,11 +238,6 @@
<EmbeddedResource Include="Properties\Resources.zh-CN.resx" /> <EmbeddedResource Include="Properties\Resources.zh-CN.resx" />
<EmbeddedResource Include="Properties\Resources.zh-TW.resx" /> <EmbeddedResource Include="Properties\Resources.zh-TW.resx" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="StyleCop.Analyzers">
<Version>1.1.0-beta007</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.

3
ShareX.NativeMessagingHost/ShareX.NativeMessagingHost.csproj
View file

@ -65,9 +65,6 @@
<PackageReference Include="Newtonsoft.Json"> <PackageReference Include="Newtonsoft.Json">
<Version>11.0.2</Version> <Version>11.0.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="StyleCop.Analyzers">
<Version>1.1.0-beta007</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

3
ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
View file

@ -579,9 +579,6 @@
<PackageReference Include="ImageListView"> <PackageReference Include="ImageListView">
<Version>11.0.4</Version> <Version>11.0.4</Version>
</PackageReference> </PackageReference>
<PackageReference Include="StyleCop.Analyzers">
<Version>1.1.0-beta007</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

5
ShareX.Setup/ShareX.Setup.csproj
View file

@ -92,11 +92,6 @@
<Name>ShareX.HelpersLib</Name> <Name>ShareX.HelpersLib</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="StyleCop.Analyzers">
<Version>1.1.0-beta007</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.

5
ShareX.Steam/ShareX.Steam.csproj
View file

@ -74,11 +74,6 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="StyleCop.Analyzers">
<Version>1.1.0-beta007</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.

3
ShareX.UploadersLib/ShareX.UploadersLib.csproj
View file

@ -964,9 +964,6 @@
<PackageReference Include="SSH.NET"> <PackageReference Include="SSH.NET">
<Version>2016.1.0</Version> <Version>2016.1.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="StyleCop.Analyzers">
<Version>1.1.0-beta007</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup> <PropertyGroup>

3
ShareX.sln
View file

@ -155,9 +155,6 @@ Global
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
RESX_ShowErrorsInErrorList = False
RESX_AutoCreateNewLanguageFiles = True
RESX_ConfirmAddLanguageFile = False
SolutionGuid = {DEACF1C2-28EE-44DF-B55E-2234F6137272} SolutionGuid = {DEACF1C2-28EE-44DF-B55E-2234F6137272}
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal

3
ShareX/ShareX.csproj
View file

@ -1559,9 +1559,6 @@
<PackageReference Include="Newtonsoft.Json"> <PackageReference Include="Newtonsoft.Json">
<Version>11.0.2</Version> <Version>11.0.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="StyleCop.Analyzers">
<Version>1.1.0-beta007</Version>
</PackageReference>
<PackageReference Include="ZXing.Net"> <PackageReference Include="ZXing.Net">
<Version>0.16.4</Version> <Version>0.16.4</Version>
</PackageReference> </PackageReference>