From 86113a4eeb13c7841a3580438c2b1f2f7f3c190c Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Tue, 25 Jul 2017 13:33:57 +0200 Subject: [PATCH 01/19] Added StyleCop.Analyzers to the solution. --- paket.dependencies | 3 +- paket.lock | 1 + .../Generator.Convert.csproj | 202 +------- .../Generator.Rewrite.csproj | 222 +------- src/OpenTK.GLWidget/OpenTK.GLWidget.csproj | 48 +- tests/OpenTK.Tests/OpenTK.Tests.fsproj | 484 ++---------------- 6 files changed, 77 insertions(+), 883 deletions(-) diff --git a/paket.dependencies b/paket.dependencies index 305b9e76..965551f6 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -6,8 +6,9 @@ nuget CommandLineParser >= 2.1.1-beta nuget FSharp.Formatting nuget FsCheck nuget FsCheck.Xunit +nuget StyleCop.Analyzers nuget xunit.runner.console nuget xunit.assert nuget FAKE nuget Mono.Cecil >= 0.10.0-beta6 -nuget gtk-sharp3 +nuget gtk-sharp3 \ No newline at end of file diff --git a/paket.lock b/paket.lock index 32dbe000..17954511 100644 --- a/paket.lock +++ b/paket.lock @@ -150,6 +150,7 @@ NUGET runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net452) (>= netstandard1.3) (< monotouch) (< xamarinios) (< xamarinmac)) (&& (>= netstandard1.6) (< monotouch) (< xamarinios) (< xamarinmac)) runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net452) (>= netstandard1.3) (< monotouch) (< xamarinios) (< xamarinmac)) (&& (>= netstandard1.6) (< monotouch) (< xamarinios) (< xamarinmac)) runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.1) - restriction: || (&& (< net452) (>= netstandard1.3) (< monotouch) (< xamarinios) (< xamarinmac)) (&& (>= netstandard1.6) (< monotouch) (< xamarinios) (< xamarinmac)) + StyleCop.Analyzers (1.0.2) System.AppContext (4.3) - restriction: || (&& (< net452) (>= netstandard1.3)) (>= netstandard1.6) System.Runtime (>= 4.3) - restriction: || (&& (< net46) (>= netstandard1.3) (< netstandard1.6) (< monoandroid)) (>= dnxcore50) (&& (>= netstandard1.6) (< monotouch) (< xamarinios) (< xamarinmac)) System.Buffers (4.3) - restriction: || (&& (< net45) (>= netstandard1.3) (< monotouch) (< xamarinios) (< xamarinmac) (< win8) (< wpa81)) (&& (< net452) (>= netstandard1.3) (< monotouch) (< xamarinios) (< xamarinmac)) (&& (>= dnxcore50) (>= netstandard1.1)) (&& (>= dnxcore50) (>= netstandard1.6)) (&& (>= netstandard1.6) (< monotouch) (< xamarinios) (< xamarinmac)) diff --git a/src/Generator.Converter/Generator.Convert.csproj b/src/Generator.Converter/Generator.Convert.csproj index e4729b9b..929020de 100644 --- a/src/Generator.Converter/Generator.Convert.csproj +++ b/src/Generator.Converter/Generator.Convert.csproj @@ -137,7 +137,7 @@ - + ..\..\packages\CommandLineParser\lib\netstandard1.5\CommandLine.dll @@ -155,11 +155,6 @@ False True - - ..\..\packages\System.Collections\ref\netstandard1.0\System.Collections.xml - False - True - @@ -169,11 +164,6 @@ False True - - ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.xml - False - True - @@ -197,11 +187,6 @@ False True - - ..\..\packages\System.Console\ref\netstandard1.3\System.Console.xml - False - True - @@ -213,11 +198,6 @@ False True - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.0\System.Diagnostics.Debug.xml - False - True - @@ -227,11 +207,6 @@ False True - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.xml - False - True - @@ -243,11 +218,6 @@ False True - - ..\..\packages\System.Globalization\ref\netstandard1.0\System.Globalization.xml - False - True - @@ -257,11 +227,6 @@ False True - - ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.xml - False - True - @@ -282,11 +247,6 @@ False True - - ..\..\packages\System.IO\ref\netstandard1.0\System.IO.xml - False - True - @@ -296,11 +256,6 @@ False True - - ..\..\packages\System.IO\ref\netstandard1.3\System.IO.xml - False - True - @@ -310,11 +265,6 @@ False True - - ..\..\packages\System.IO\ref\netstandard1.5\System.IO.xml - False - True - @@ -335,11 +285,6 @@ False True - - ..\..\packages\System.Linq\ref\netstandard1.0\System.Linq.xml - False - True - @@ -358,11 +303,6 @@ False True - - ..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.xml - False - True - @@ -383,11 +323,6 @@ False True - - ..\..\packages\System.Linq.Expressions\ref\netstandard1.0\System.Linq.Expressions.xml - False - True - @@ -397,11 +332,6 @@ False True - - ..\..\packages\System.Linq.Expressions\ref\netstandard1.3\System.Linq.Expressions.xml - False - True - @@ -420,11 +350,6 @@ False True - - ..\..\packages\System.Linq.Expressions\ref\netstandard1.6\System.Linq.Expressions.xml - False - True - @@ -436,11 +361,6 @@ False True - - ..\..\packages\System.ObjectModel\ref\netstandard1.0\System.ObjectModel.xml - False - True - @@ -459,11 +379,6 @@ False True - - ..\..\packages\System.ObjectModel\ref\netstandard1.3\System.ObjectModel.xml - False - True - @@ -484,11 +399,6 @@ False True - - ..\..\packages\System.Reflection\ref\netstandard1.0\System.Reflection.xml - False - True - @@ -498,11 +408,6 @@ False True - - ..\..\packages\System.Reflection\ref\netstandard1.3\System.Reflection.xml - False - True - @@ -512,11 +417,6 @@ False True - - ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.xml - False - True - @@ -528,11 +428,6 @@ False True - - ..\..\packages\System.Reflection.Emit\ref\netstandard1.1\System.Reflection.Emit.xml - False - True - @@ -553,11 +448,6 @@ False True - - ..\..\packages\System.Reflection.Emit.ILGeneration\ref\netstandard1.0\System.Reflection.Emit.ILGeneration.xml - False - True - @@ -578,11 +468,6 @@ False True - - ..\..\packages\System.Reflection.Emit.Lightweight\ref\netstandard1.0\System.Reflection.Emit.Lightweight.xml - False - True - @@ -603,11 +488,6 @@ False True - - ..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.xml - False - True - @@ -619,11 +499,6 @@ False True - - ..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.xml - False - True - @@ -653,11 +528,6 @@ False True - - ..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.5\System.Reflection.TypeExtensions.xml - False - True - @@ -669,11 +539,6 @@ False True - - ..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.xml - False - True - @@ -704,11 +569,6 @@ False True - - ..\..\packages\System.Runtime\ref\netstandard1.0\System.Runtime.xml - False - True - @@ -718,11 +578,6 @@ False True - - ..\..\packages\System.Runtime\ref\netstandard1.2\System.Runtime.xml - False - True - @@ -732,11 +587,6 @@ False True - - ..\..\packages\System.Runtime\ref\netstandard1.3\System.Runtime.xml - False - True - @@ -746,11 +596,6 @@ False True - - ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.xml - False - True - @@ -771,11 +616,6 @@ False True - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.0\System.Runtime.Extensions.xml - False - True - @@ -785,11 +625,6 @@ False True - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.3\System.Runtime.Extensions.xml - False - True - @@ -799,11 +634,6 @@ False True - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.xml - False - True - @@ -815,11 +645,6 @@ False True - - ..\..\packages\System.Text.Encoding\ref\netstandard1.0\System.Text.Encoding.xml - False - True - @@ -829,11 +654,6 @@ False True - - ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.xml - False - True - @@ -845,11 +665,6 @@ False True - - ..\..\packages\System.Threading\ref\netstandard1.0\System.Threading.xml - False - True - @@ -868,11 +683,6 @@ False True - - ..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.xml - False - True - @@ -884,11 +694,6 @@ False True - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.0\System.Threading.Tasks.xml - False - True - @@ -898,11 +703,6 @@ False True - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.xml - False - True - diff --git a/src/Generator.Rewrite/Generator.Rewrite.csproj b/src/Generator.Rewrite/Generator.Rewrite.csproj index fb9b52fa..31a11d33 100644 --- a/src/Generator.Rewrite/Generator.Rewrite.csproj +++ b/src/Generator.Rewrite/Generator.Rewrite.csproj @@ -134,7 +134,7 @@ - + ..\..\packages\Mono.Cecil\lib\netstandard1.3\Mono.Cecil.dll @@ -167,11 +167,6 @@ False True - - ..\..\packages\System.Collections\ref\netstandard1.0\System.Collections.xml - False - True - @@ -181,11 +176,6 @@ False True - - ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.xml - False - True - @@ -197,11 +187,6 @@ False True - - ..\..\packages\System.Collections.Concurrent\ref\netstandard1.1\System.Collections.Concurrent.xml - False - True - @@ -220,11 +205,6 @@ False True - - ..\..\packages\System.Collections.Concurrent\ref\netstandard1.3\System.Collections.Concurrent.xml - False - True - @@ -236,11 +216,6 @@ False True - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.0\System.Diagnostics.Debug.xml - False - True - @@ -250,11 +225,6 @@ False True - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.xml - False - True - @@ -266,11 +236,6 @@ False True - - ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.1\System.Diagnostics.Tracing.xml - False - True - @@ -280,11 +245,6 @@ False True - - ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.2\System.Diagnostics.Tracing.xml - False - True - @@ -294,11 +254,6 @@ False True - - ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.3\System.Diagnostics.Tracing.xml - False - True - @@ -308,11 +263,6 @@ False True - - ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.xml - False - True - @@ -324,11 +274,6 @@ False True - - ..\..\packages\System.Globalization\ref\netstandard1.0\System.Globalization.xml - False - True - @@ -338,11 +283,6 @@ False True - - ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.xml - False - True - @@ -366,11 +306,6 @@ False True - - ..\..\packages\System.IO\ref\netstandard1.0\System.IO.xml - False - True - @@ -380,11 +315,6 @@ False True - - ..\..\packages\System.IO\ref\netstandard1.3\System.IO.xml - False - True - @@ -394,11 +324,6 @@ False True - - ..\..\packages\System.IO\ref\netstandard1.5\System.IO.xml - False - True - @@ -410,11 +335,6 @@ False True - - ..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.xml - False - True - @@ -435,11 +355,6 @@ False True - - ..\..\packages\System.IO.FileSystem.Primitives\ref\netstandard1.3\System.IO.FileSystem.Primitives.xml - False - True - @@ -460,11 +375,6 @@ False True - - ..\..\packages\System.Linq\ref\netstandard1.0\System.Linq.xml - False - True - @@ -483,11 +393,6 @@ False True - - ..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.xml - False - True - @@ -508,11 +413,6 @@ False True - - ..\..\packages\System.Reflection\ref\netstandard1.0\System.Reflection.xml - False - True - @@ -522,11 +422,6 @@ False True - - ..\..\packages\System.Reflection\ref\netstandard1.3\System.Reflection.xml - False - True - @@ -536,11 +431,6 @@ False True - - ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.xml - False - True - @@ -552,11 +442,6 @@ False True - - ..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.xml - False - True - @@ -568,11 +453,6 @@ False True - - ..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.xml - False - True - @@ -603,11 +483,6 @@ False True - - ..\..\packages\System.Runtime\ref\netstandard1.0\System.Runtime.xml - False - True - @@ -617,11 +492,6 @@ False True - - ..\..\packages\System.Runtime\ref\netstandard1.2\System.Runtime.xml - False - True - @@ -631,11 +501,6 @@ False True - - ..\..\packages\System.Runtime\ref\netstandard1.3\System.Runtime.xml - False - True - @@ -645,11 +510,6 @@ False True - - ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.xml - False - True - @@ -670,11 +530,6 @@ False True - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.0\System.Runtime.Extensions.xml - False - True - @@ -684,11 +539,6 @@ False True - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.3\System.Runtime.Extensions.xml - False - True - @@ -698,11 +548,6 @@ False True - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.xml - False - True - @@ -714,11 +559,6 @@ False True - - ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.xml - False - True - @@ -739,11 +579,6 @@ False True - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.1\System.Runtime.InteropServices.xml - False - True - @@ -753,11 +588,6 @@ False True - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.2\System.Runtime.InteropServices.xml - False - True - @@ -767,11 +597,6 @@ False True - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.3\System.Runtime.InteropServices.xml - False - True - @@ -781,11 +606,6 @@ False True - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.xml - False - True - @@ -804,11 +624,6 @@ False True - - ..\..\packages\System.Runtime.Numerics\ref\netstandard1.1\System.Runtime.Numerics.xml - False - True - @@ -869,11 +684,6 @@ False True - - ..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.xml - False - True - @@ -905,11 +715,6 @@ False True - - ..\..\packages\System.Text.Encoding\ref\netstandard1.0\System.Text.Encoding.xml - False - True - @@ -919,11 +724,6 @@ False True - - ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.xml - False - True - @@ -935,11 +735,6 @@ False True - - ..\..\packages\System.Threading\ref\netstandard1.0\System.Threading.xml - False - True - @@ -958,11 +753,6 @@ False True - - ..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.xml - False - True - @@ -974,11 +764,6 @@ False True - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.0\System.Threading.Tasks.xml - False - True - @@ -988,11 +773,6 @@ False True - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.xml - False - True - diff --git a/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj b/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj index 2c1e8aac..da0546cf 100644 --- a/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj +++ b/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj @@ -91,31 +91,48 @@ - + - - ..\..\packages\gtk-sharp3\lib\net40\atk-sharp.dll - - + ..\..\packages\gtk-sharp3\lib\net40\cairo-sharp.dll + True + True - - ..\..\packages\gtk-sharp3\lib\net40\gdk-sharp.dll - - + ..\..\packages\gtk-sharp3\lib\net40\gio-sharp.dll + True + True - - ..\..\packages\gtk-sharp3\lib\net40\glib-sharp.dll - - + ..\..\packages\gtk-sharp3\lib\net40\gtk-dotnet.dll + True + True - + + ..\..\packages\gtk-sharp3\lib\net40\atk-sharp.dll + True + True + + + ..\..\packages\gtk-sharp3\lib\net40\gdk-sharp.dll + True + True + + + ..\..\packages\gtk-sharp3\lib\net40\glib-sharp.dll + True + True + + ..\..\packages\gtk-sharp3\lib\net40\gtk-sharp.dll + True + True - + ..\..\packages\gtk-sharp3\lib\net40\pango-sharp.dll + True + True @@ -151,4 +168,5 @@ + \ No newline at end of file diff --git a/tests/OpenTK.Tests/OpenTK.Tests.fsproj b/tests/OpenTK.Tests/OpenTK.Tests.fsproj index ca22c1fc..f7cd0f2a 100644 --- a/tests/OpenTK.Tests/OpenTK.Tests.fsproj +++ b/tests/OpenTK.Tests/OpenTK.Tests.fsproj @@ -90,7 +90,7 @@ - + ..\..\packages\FsCheck\lib\netstandard1.6\FsCheck.dll @@ -137,7 +137,7 @@ - + ..\..\packages\FsCheck.Xunit\lib\netstandard1.6\FsCheck.Xunit.dll @@ -157,7 +157,7 @@ - + ..\..\packages\FSharp.Core\lib\netstandard1.6\FSharp.Core.dll @@ -175,11 +175,6 @@ False True - - ..\..\packages\Microsoft.Win32.Primitives\ref\netstandard1.3\Microsoft.Win32.Primitives.xml - False - True - @@ -191,11 +186,6 @@ False True - - ..\..\packages\System.AppContext\ref\netstandard1.3\System.AppContext.xml - False - True - @@ -214,16 +204,11 @@ False True - - ..\..\packages\System.AppContext\ref\netstandard1.6\System.AppContext.xml - False - True - - + ..\..\packages\System.Buffers\lib\netstandard1.1\System.Buffers.dll @@ -241,11 +226,6 @@ False True - - ..\..\packages\System.Collections\ref\netstandard1.0\System.Collections.xml - False - True - @@ -255,11 +235,6 @@ False True - - ..\..\packages\System.Collections\ref\netstandard1.3\System.Collections.xml - False - True - @@ -271,11 +246,6 @@ False True - - ..\..\packages\System.Collections.Concurrent\ref\netstandard1.1\System.Collections.Concurrent.xml - False - True - @@ -294,11 +264,6 @@ False True - - ..\..\packages\System.Collections.Concurrent\ref\netstandard1.3\System.Collections.Concurrent.xml - False - True - @@ -319,11 +284,6 @@ False True - - ..\..\packages\System.Console\ref\netstandard1.3\System.Console.xml - False - True - @@ -335,11 +295,6 @@ False True - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.0\System.Diagnostics.Debug.xml - False - True - @@ -349,25 +304,11 @@ False True - - ..\..\packages\System.Diagnostics.Debug\ref\netstandard1.3\System.Diagnostics.Debug.xml - False - True - - - - - ..\..\packages\System.Diagnostics.DiagnosticSource\ref\netcoreapp2.0\_._ - False - True - - - - + ..\..\packages\System.Diagnostics.DiagnosticSource\lib\netstandard1.3\System.Diagnostics.DiagnosticSource.dll @@ -385,11 +326,6 @@ False True - - ..\..\packages\System.Diagnostics.Tools\ref\netstandard1.0\System.Diagnostics.Tools.xml - False - True - @@ -401,11 +337,6 @@ False True - - ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.1\System.Diagnostics.Tracing.xml - False - True - @@ -415,11 +346,6 @@ False True - - ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.2\System.Diagnostics.Tracing.xml - False - True - @@ -429,11 +355,6 @@ False True - - ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.3\System.Diagnostics.Tracing.xml - False - True - @@ -443,11 +364,6 @@ False True - - ..\..\packages\System.Diagnostics.Tracing\ref\netstandard1.5\System.Diagnostics.Tracing.xml - False - True - @@ -459,11 +375,6 @@ False True - - ..\..\packages\System.Globalization\ref\netstandard1.0\System.Globalization.xml - False - True - @@ -473,11 +384,6 @@ False True - - ..\..\packages\System.Globalization\ref\netstandard1.3\System.Globalization.xml - False - True - @@ -489,11 +395,6 @@ False True - - ..\..\packages\System.Globalization.Calendars\ref\netstandard1.3\System.Globalization.Calendars.xml - False - True - @@ -505,11 +406,6 @@ False True - - ..\..\packages\System.Globalization.Extensions\ref\netstandard1.3\System.Globalization.Extensions.xml - False - True - @@ -530,11 +426,6 @@ False True - - ..\..\packages\System.IO\ref\netstandard1.0\System.IO.xml - False - True - @@ -544,11 +435,6 @@ False True - - ..\..\packages\System.IO\ref\netstandard1.3\System.IO.xml - False - True - @@ -558,11 +444,6 @@ False True - - ..\..\packages\System.IO\ref\netstandard1.5\System.IO.xml - False - True - @@ -595,11 +476,6 @@ False True - - ..\..\packages\System.IO.Compression\ref\netstandard1.1\System.IO.Compression.xml - False - True - @@ -609,11 +485,6 @@ False True - - ..\..\packages\System.IO.Compression\ref\netstandard1.3\System.IO.Compression.xml - False - True - @@ -630,6 +501,20 @@ + + + + True + + + + + + + True + + + @@ -648,11 +533,6 @@ False True - - ..\..\packages\System.IO.Compression.ZipFile\ref\netstandard1.3\System.IO.Compression.ZipFile.xml - False - True - @@ -664,11 +544,6 @@ False True - - ..\..\packages\System.IO.FileSystem\ref\netstandard1.3\System.IO.FileSystem.xml - False - True - @@ -689,11 +564,6 @@ False True - - ..\..\packages\System.IO.FileSystem.Primitives\ref\netstandard1.3\System.IO.FileSystem.Primitives.xml - False - True - @@ -714,11 +584,6 @@ False True - - ..\..\packages\System.Linq\ref\netstandard1.0\System.Linq.xml - False - True - @@ -737,11 +602,6 @@ False True - - ..\..\packages\System.Linq\ref\netstandard1.6\System.Linq.xml - False - True - @@ -762,11 +622,6 @@ False True - - ..\..\packages\System.Linq.Expressions\ref\netstandard1.0\System.Linq.Expressions.xml - False - True - @@ -776,11 +631,6 @@ False True - - ..\..\packages\System.Linq.Expressions\ref\netstandard1.3\System.Linq.Expressions.xml - False - True - @@ -799,11 +649,6 @@ False True - - ..\..\packages\System.Linq.Expressions\ref\netstandard1.6\System.Linq.Expressions.xml - False - True - @@ -815,11 +660,6 @@ False True - - ..\..\packages\System.Linq.Queryable\ref\netstandard1.0\System.Linq.Queryable.xml - False - True - @@ -886,6 +726,20 @@ + + + + True + + + + + + + True + + + @@ -895,11 +749,6 @@ False True - - ..\..\packages\System.Net.Primitives\ref\netstandard1.1\System.Net.Primitives.xml - False - True - @@ -909,11 +758,6 @@ False True - - ..\..\packages\System.Net.Primitives\ref\netstandard1.3\System.Net.Primitives.xml - False - True - @@ -925,11 +769,6 @@ False True - - ..\..\packages\System.Net.Requests\ref\netstandard1.3\System.Net.Requests.xml - False - True - @@ -941,11 +780,6 @@ False True - - ..\..\packages\System.Net.Sockets\ref\netstandard1.3\System.Net.Sockets.xml - False - True - @@ -966,11 +800,6 @@ False True - - ..\..\packages\System.Net.WebHeaderCollection\ref\netstandard1.3\System.Net.WebHeaderCollection.xml - False - True - @@ -982,11 +811,6 @@ False True - - ..\..\packages\System.ObjectModel\ref\netstandard1.0\System.ObjectModel.xml - False - True - @@ -1005,11 +829,6 @@ False True - - ..\..\packages\System.ObjectModel\ref\netstandard1.3\System.ObjectModel.xml - False - True - @@ -1030,11 +849,6 @@ False True - - ..\..\packages\System.Reflection\ref\netstandard1.0\System.Reflection.xml - False - True - @@ -1044,11 +858,6 @@ False True - - ..\..\packages\System.Reflection\ref\netstandard1.3\System.Reflection.xml - False - True - @@ -1058,11 +867,6 @@ False True - - ..\..\packages\System.Reflection\ref\netstandard1.5\System.Reflection.xml - False - True - @@ -1074,11 +878,6 @@ False True - - ..\..\packages\System.Reflection.Emit\ref\netstandard1.1\System.Reflection.Emit.xml - False - True - @@ -1099,11 +898,6 @@ False True - - ..\..\packages\System.Reflection.Emit.ILGeneration\ref\netstandard1.0\System.Reflection.Emit.ILGeneration.xml - False - True - @@ -1124,11 +918,6 @@ False True - - ..\..\packages\System.Reflection.Emit.Lightweight\ref\netstandard1.0\System.Reflection.Emit.Lightweight.xml - False - True - @@ -1149,11 +938,6 @@ False True - - ..\..\packages\System.Reflection.Extensions\ref\netstandard1.0\System.Reflection.Extensions.xml - False - True - @@ -1165,11 +949,6 @@ False True - - ..\..\packages\System.Reflection.Primitives\ref\netstandard1.0\System.Reflection.Primitives.xml - False - True - @@ -1199,11 +978,6 @@ False True - - ..\..\packages\System.Reflection.TypeExtensions\ref\netstandard1.5\System.Reflection.TypeExtensions.xml - False - True - @@ -1215,11 +989,6 @@ False True - - ..\..\packages\System.Resources.ResourceManager\ref\netstandard1.0\System.Resources.ResourceManager.xml - False - True - @@ -1250,11 +1019,6 @@ False True - - ..\..\packages\System.Runtime\ref\netstandard1.0\System.Runtime.xml - False - True - @@ -1264,11 +1028,6 @@ False True - - ..\..\packages\System.Runtime\ref\netstandard1.2\System.Runtime.xml - False - True - @@ -1278,11 +1037,6 @@ False True - - ..\..\packages\System.Runtime\ref\netstandard1.3\System.Runtime.xml - False - True - @@ -1292,11 +1046,6 @@ False True - - ..\..\packages\System.Runtime\ref\netstandard1.5\System.Runtime.xml - False - True - @@ -1317,11 +1066,6 @@ False True - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.0\System.Runtime.Extensions.xml - False - True - @@ -1331,11 +1075,6 @@ False True - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.3\System.Runtime.Extensions.xml - False - True - @@ -1345,11 +1084,6 @@ False True - - ..\..\packages\System.Runtime.Extensions\ref\netstandard1.5\System.Runtime.Extensions.xml - False - True - @@ -1361,11 +1095,6 @@ False True - - ..\..\packages\System.Runtime.Handles\ref\netstandard1.3\System.Runtime.Handles.xml - False - True - @@ -1386,11 +1115,6 @@ False True - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.1\System.Runtime.InteropServices.xml - False - True - @@ -1400,11 +1124,6 @@ False True - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.2\System.Runtime.InteropServices.xml - False - True - @@ -1414,11 +1133,6 @@ False True - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.3\System.Runtime.InteropServices.xml - False - True - @@ -1428,11 +1142,6 @@ False True - - ..\..\packages\System.Runtime.InteropServices\ref\netstandard1.5\System.Runtime.InteropServices.xml - False - True - @@ -1482,11 +1191,6 @@ False True - - ..\..\packages\System.Runtime.Numerics\ref\netstandard1.1\System.Runtime.Numerics.xml - False - True - @@ -1558,16 +1262,11 @@ False True - - ..\..\packages\System.Security.Cryptography.Encoding\ref\netstandard1.3\System.Security.Cryptography.Encoding.xml - False - True - - + ..\..\packages\System.Security.Cryptography.OpenSsl\lib\netstandard1.6\System.Security.Cryptography.OpenSsl.dll @@ -1614,11 +1313,6 @@ False True - - ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.3\System.Security.Cryptography.X509Certificates.xml - False - True - @@ -1628,11 +1322,6 @@ False True - - ..\..\packages\System.Security.Cryptography.X509Certificates\ref\netstandard1.4\System.Security.Cryptography.X509Certificates.xml - False - True - @@ -1644,11 +1333,6 @@ False True - - ..\..\packages\System.Text.Encoding\ref\netstandard1.0\System.Text.Encoding.xml - False - True - @@ -1658,11 +1342,6 @@ False True - - ..\..\packages\System.Text.Encoding\ref\netstandard1.3\System.Text.Encoding.xml - False - True - @@ -1674,11 +1353,6 @@ False True - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.0\System.Text.Encoding.Extensions.xml - False - True - @@ -1688,11 +1362,6 @@ False True - - ..\..\packages\System.Text.Encoding.Extensions\ref\netstandard1.3\System.Text.Encoding.Extensions.xml - False - True - @@ -1713,11 +1382,6 @@ False True - - ..\..\packages\System.Text.RegularExpressions\ref\netstandard1.0\System.Text.RegularExpressions.xml - False - True - @@ -1727,11 +1391,6 @@ False True - - ..\..\packages\System.Text.RegularExpressions\ref\netstandard1.3\System.Text.RegularExpressions.xml - False - True - @@ -1750,11 +1409,6 @@ False True - - ..\..\packages\System.Text.RegularExpressions\ref\netstandard1.6\System.Text.RegularExpressions.xml - False - True - @@ -1766,11 +1420,6 @@ False True - - ..\..\packages\System.Threading\ref\netstandard1.0\System.Threading.xml - False - True - @@ -1789,11 +1438,6 @@ False True - - ..\..\packages\System.Threading\ref\netstandard1.3\System.Threading.xml - False - True - @@ -1805,11 +1449,6 @@ False True - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.0\System.Threading.Tasks.xml - False - True - @@ -1819,16 +1458,11 @@ False True - - ..\..\packages\System.Threading.Tasks\ref\netstandard1.3\System.Threading.Tasks.xml - False - True - - + ..\..\packages\System.Threading.Tasks.Extensions\lib\netstandard1.0\System.Threading.Tasks.Extensions.dll @@ -1846,11 +1480,6 @@ False True - - ..\..\packages\System.Threading.Tasks.Parallel\ref\netstandard1.1\System.Threading.Tasks.Parallel.xml - False - True - @@ -1880,11 +1509,6 @@ False True - - ..\..\packages\System.Threading.Thread\ref\netstandard1.3\System.Threading.Thread.xml - False - True - @@ -1905,11 +1529,6 @@ False True - - ..\..\packages\System.Threading.ThreadPool\ref\netstandard1.3\System.Threading.ThreadPool.xml - False - True - @@ -1921,11 +1540,6 @@ False True - - ..\..\packages\System.Threading.Timer\ref\netstandard1.2\System.Threading.Timer.xml - False - True - @@ -1944,11 +1558,6 @@ False True - - ..\..\packages\System.Xml.ReaderWriter\ref\netstandard1.0\System.Xml.ReaderWriter.xml - False - True - @@ -1967,11 +1576,6 @@ False True - - ..\..\packages\System.Xml.ReaderWriter\ref\netstandard1.3\System.Xml.ReaderWriter.xml - False - True - @@ -1990,11 +1594,6 @@ False True - - ..\..\packages\System.Xml.XDocument\ref\netstandard1.0\System.Xml.XDocument.xml - False - True - @@ -2013,11 +1612,6 @@ False True - - ..\..\packages\System.Xml.XDocument\ref\netstandard1.3\System.Xml.XDocument.xml - False - True - @@ -2031,7 +1625,7 @@ - + ..\..\packages\xunit.abstractions\lib\netstandard1.0\xunit.abstractions.dll @@ -2042,7 +1636,7 @@ - + ..\..\packages\xunit.assert\lib\netstandard1.1\xunit.assert.dll @@ -2053,7 +1647,7 @@ - + ..\..\packages\xunit.extensibility.core\lib\netstandard1.1\xunit.core.dll @@ -2073,7 +1667,7 @@ - + ..\..\packages\xunit.extensibility.execution\lib\netstandard1.1\xunit.execution.dotnet.dll From 86f7c1945f4d2d3f74354027ba8fc527baee0205 Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Tue, 25 Jul 2017 13:36:25 +0200 Subject: [PATCH 02/19] Added StyleCop.Analyzers to OpenTK.GLWidget --- src/OpenTK.GLWidget/OpenTK.GLWidget.csproj | 50 +++++++++++++--------- src/OpenTK.GLWidget/paket.references | 1 + 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj b/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj index da0546cf..ea48e101 100644 --- a/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj +++ b/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj @@ -90,6 +90,27 @@ System + + + OpenTK + {A37A7E14-0000-0000-0000-000000000000} + False + + + + + + Code + + + + + + + + + + @@ -147,26 +168,13 @@ - - - OpenTK - {A37A7E14-0000-0000-0000-000000000000} - False - - - - - - Code - - - - - - - - - - + + + True + + + True + + \ No newline at end of file diff --git a/src/OpenTK.GLWidget/paket.references b/src/OpenTK.GLWidget/paket.references index f1b428b5..c88a3540 100644 --- a/src/OpenTK.GLWidget/paket.references +++ b/src/OpenTK.GLWidget/paket.references @@ -1 +1,2 @@ gtk-sharp3 +StyleCop.Analyzers \ No newline at end of file From 2fd5486735a1dffff8e0278fb1783a8ff3e25ea0 Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Tue, 25 Jul 2017 14:29:00 +0200 Subject: [PATCH 03/19] Added stylecop configuration file and rule set. --- src/OpenTK.GLWidget/OpenTK.GLWidget.csproj | 4 + stylecop.json | 54 ++++++ stylecop.ruleset | 195 +++++++++++++++++++++ 3 files changed, 253 insertions(+) create mode 100644 stylecop.json create mode 100644 stylecop.ruleset diff --git a/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj b/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj index ea48e101..cddbd508 100644 --- a/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj +++ b/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj @@ -110,6 +110,10 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From b72c04bb3dd2db9c5d2cbb054df679ec36d8bd93 Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Tue, 25 Jul 2017 14:47:07 +0200 Subject: [PATCH 04/19] Enabled StyleCop inspections for all projects. This replaces AllRules. --- src/Generator.Bind/Generator.Bind.csproj | 8 ++++++-- src/Generator.Converter/Generator.Convert.csproj | 8 ++++++-- src/Generator.Rewrite/Generator.Rewrite.csproj | 6 ++++++ src/OpenTK.GLControl/OpenTK.GLControl.csproj | 9 +++++++-- src/OpenTK.GLWidget/OpenTK.GLWidget.csproj | 7 ++++--- src/OpenTK/OpenTK.Android.csproj | 6 ++++++ src/OpenTK/OpenTK.csproj | 8 ++++++-- src/OpenTK/OpenTK.iOS.csproj | 7 +++++++ 8 files changed, 48 insertions(+), 11 deletions(-) diff --git a/src/Generator.Bind/Generator.Bind.csproj b/src/Generator.Bind/Generator.Bind.csproj index 9f1c55a3..e97745fd 100644 --- a/src/Generator.Bind/Generator.Bind.csproj +++ b/src/Generator.Bind/Generator.Bind.csproj @@ -41,6 +41,8 @@ false true true + true + ..\..\stylecop.ruleset 285212672 @@ -54,7 +56,6 @@ False False 4 - AllRules.ruleset full @@ -68,7 +69,6 @@ False False 4 - AllRules.ruleset none @@ -239,6 +239,10 @@ Designer + + + + diff --git a/src/Generator.Converter/Generator.Convert.csproj b/src/Generator.Converter/Generator.Convert.csproj index 929020de..ef29735b 100644 --- a/src/Generator.Converter/Generator.Convert.csproj +++ b/src/Generator.Converter/Generator.Convert.csproj @@ -40,6 +40,8 @@ false true true + true + ..\..\stylecop.ruleset 285212672 @@ -53,7 +55,6 @@ False False 4 - AllRules.ruleset full -p:gl -v:4.5 -t:xml -o:../../../Source/Bind/Specifications/GL2/signatures.xml https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/gl.xml @@ -68,7 +69,6 @@ False False 4 - AllRules.ruleset none @@ -111,6 +111,10 @@ + + + + diff --git a/src/Generator.Rewrite/Generator.Rewrite.csproj b/src/Generator.Rewrite/Generator.Rewrite.csproj index 31a11d33..afafb5ca 100644 --- a/src/Generator.Rewrite/Generator.Rewrite.csproj +++ b/src/Generator.Rewrite/Generator.Rewrite.csproj @@ -25,6 +25,8 @@ prompt 4 ../../OpenTK/Debug/OpenTK.dll ../../../OpenTK.snk -debug + true + ..\..\stylecop.ruleset AnyCPU @@ -63,6 +65,10 @@ + + + + - - + + - - + + From 0ed06b8aa1a8c8b5db7bb1b973f27c573bd54a1d Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Tue, 25 Jul 2017 14:54:10 +0200 Subject: [PATCH 06/19] Enabled SA1003. --- stylecop.ruleset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stylecop.ruleset b/stylecop.ruleset index 6b24d127..5fa47cfc 100644 --- a/stylecop.ruleset +++ b/stylecop.ruleset @@ -9,7 +9,7 @@ - + From 5d0b6f808aae270b09b60c158d4054d0756a132c Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Tue, 25 Jul 2017 14:55:00 +0200 Subject: [PATCH 07/19] Enabled SA1004. --- stylecop.ruleset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stylecop.ruleset b/stylecop.ruleset index 5fa47cfc..6d295d29 100644 --- a/stylecop.ruleset +++ b/stylecop.ruleset @@ -10,7 +10,7 @@ - + From a8998fec91be3f874ae755ec25c8c32a3087ee74 Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Tue, 25 Jul 2017 15:23:49 +0200 Subject: [PATCH 08/19] Enabled compliant rules in the SA10 block. --- stylecop.ruleset | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/stylecop.ruleset b/stylecop.ruleset index 6d295d29..7ad642e0 100644 --- a/stylecop.ruleset +++ b/stylecop.ruleset @@ -12,29 +12,29 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - + + + + From 577fb4e0983f214456620b3d111e3e84e05f2b68 Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Tue, 25 Jul 2017 15:49:07 +0200 Subject: [PATCH 09/19] Forgot to add StyleCop.Analyzers to the other projects as well. --- src/Generator.Bind/Generator.Bind.csproj | 8 ++++++++ src/Generator.Bind/paket.references | 1 + src/Generator.Converter/Generator.Convert.csproj | 8 ++++++++ src/Generator.Converter/paket.references | 3 ++- src/Generator.Rewrite/Generator.Rewrite.csproj | 8 ++++++++ src/Generator.Rewrite/paket.references | 3 ++- src/OpenTK.GLWidget/OpenTK.GLWidget.csproj | 3 +-- src/OpenTK/OpenTK.Android.csproj | 8 ++++++++ src/OpenTK/OpenTK.csproj | 8 ++++++++ src/OpenTK/OpenTK.iOS.csproj | 8 ++++++++ src/OpenTK/paket.references | 1 + 11 files changed, 55 insertions(+), 4 deletions(-) diff --git a/src/Generator.Bind/Generator.Bind.csproj b/src/Generator.Bind/Generator.Bind.csproj index e97745fd..5f2f1f2a 100644 --- a/src/Generator.Bind/Generator.Bind.csproj +++ b/src/Generator.Bind/Generator.Bind.csproj @@ -267,4 +267,12 @@ + + + True + + + True + + \ No newline at end of file diff --git a/src/Generator.Bind/paket.references b/src/Generator.Bind/paket.references index e69de29b..9504c325 100644 --- a/src/Generator.Bind/paket.references +++ b/src/Generator.Bind/paket.references @@ -0,0 +1 @@ +StyleCop.Analyzers \ No newline at end of file diff --git a/src/Generator.Converter/Generator.Convert.csproj b/src/Generator.Converter/Generator.Convert.csproj index ef29735b..ae5427aa 100644 --- a/src/Generator.Converter/Generator.Convert.csproj +++ b/src/Generator.Converter/Generator.Convert.csproj @@ -151,6 +151,14 @@ + + + True + + + True + + diff --git a/src/Generator.Converter/paket.references b/src/Generator.Converter/paket.references index 3a3f8dae..a571b3b2 100644 --- a/src/Generator.Converter/paket.references +++ b/src/Generator.Converter/paket.references @@ -1 +1,2 @@ -CommandLineParser \ No newline at end of file +CommandLineParser +StyleCop.Analyzers \ No newline at end of file diff --git a/src/Generator.Rewrite/Generator.Rewrite.csproj b/src/Generator.Rewrite/Generator.Rewrite.csproj index afafb5ca..4f15dd09 100644 --- a/src/Generator.Rewrite/Generator.Rewrite.csproj +++ b/src/Generator.Rewrite/Generator.Rewrite.csproj @@ -165,6 +165,14 @@ + + + True + + + True + + diff --git a/src/Generator.Rewrite/paket.references b/src/Generator.Rewrite/paket.references index 0ac658d1..4af5b75e 100644 --- a/src/Generator.Rewrite/paket.references +++ b/src/Generator.Rewrite/paket.references @@ -1 +1,2 @@ -Mono.Cecil \ No newline at end of file +Mono.Cecil +StyleCop.Analyzers \ No newline at end of file diff --git a/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj b/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj index 5adc4294..5956bb7a 100644 --- a/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj +++ b/src/OpenTK.GLWidget/OpenTK.GLWidget.csproj @@ -44,6 +44,7 @@ true 6 true + ..\..\stylecop.ruleset True @@ -59,7 +60,6 @@ False False 4 - ..\..\stylecop.ruleset full false @@ -76,7 +76,6 @@ False False 4 - ..\..\stylecop.ruleset pdbonly false diff --git a/src/OpenTK/OpenTK.Android.csproj b/src/OpenTK/OpenTK.Android.csproj index 65123fca..4da7174e 100644 --- a/src/OpenTK/OpenTK.Android.csproj +++ b/src/OpenTK/OpenTK.Android.csproj @@ -258,4 +258,12 @@ + + + True + + + True + + \ No newline at end of file diff --git a/src/OpenTK/OpenTK.csproj b/src/OpenTK/OpenTK.csproj index f4502d8f..8bfa9080 100644 --- a/src/OpenTK/OpenTK.csproj +++ b/src/OpenTK/OpenTK.csproj @@ -808,4 +808,12 @@ + + + True + + + True + + \ No newline at end of file diff --git a/src/OpenTK/OpenTK.iOS.csproj b/src/OpenTK/OpenTK.iOS.csproj index 4d9c60b5..ec2634ac 100644 --- a/src/OpenTK/OpenTK.iOS.csproj +++ b/src/OpenTK/OpenTK.iOS.csproj @@ -248,4 +248,12 @@ + + + True + + + True + + \ No newline at end of file diff --git a/src/OpenTK/paket.references b/src/OpenTK/paket.references index e69de29b..9504c325 100644 --- a/src/OpenTK/paket.references +++ b/src/OpenTK/paket.references @@ -0,0 +1 @@ +StyleCop.Analyzers \ No newline at end of file From 25ecf7e01cdc49e61a6edea478d64d021006c5c0 Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Tue, 25 Jul 2017 16:14:23 +0200 Subject: [PATCH 10/19] Disabled noncompliant rules after scanning the other projects. --- stylecop.ruleset | 58 +++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/stylecop.ruleset b/stylecop.ruleset index 7ad642e0..4b6d2fb9 100644 --- a/stylecop.ruleset +++ b/stylecop.ruleset @@ -1,4 +1,4 @@ - + @@ -6,51 +6,51 @@ - - + + - - + + - - - - - - - + + + + + + + - + - + - - + + - + - - - - - + + + + + - - - + + + @@ -59,8 +59,8 @@ - - + + @@ -70,7 +70,9 @@ - + + + From f95019a652a7209136974088db7fa6e3f0b57b5e Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Tue, 25 Jul 2017 16:26:31 +0200 Subject: [PATCH 11/19] Added intentional metadata to some rules and enabled compliant ones in the SA12 block. --- stylecop.ruleset | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/stylecop.ruleset b/stylecop.ruleset index 4b6d2fb9..5fa4e132 100644 --- a/stylecop.ruleset +++ b/stylecop.ruleset @@ -38,7 +38,7 @@ - + @@ -46,8 +46,8 @@ - - + + @@ -87,11 +87,11 @@ - - + + - - + + From 5380c547429720445b228f1a96b09023545d6887 Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Tue, 25 Jul 2017 16:57:23 +0200 Subject: [PATCH 12/19] Enabled compliant rules in the SA13 block. --- stylecop.ruleset | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/stylecop.ruleset b/stylecop.ruleset index 5fa4e132..864c188d 100644 --- a/stylecop.ruleset +++ b/stylecop.ruleset @@ -95,14 +95,16 @@ - + - + + + @@ -191,7 +193,6 @@ - - + \ No newline at end of file From 6d3d59554a63a7ee26fd92db54ea7752125c138e Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Tue, 25 Jul 2017 22:33:21 +0200 Subject: [PATCH 13/19] Enabled compliant rules in the SA14 block. --- stylecop.ruleset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stylecop.ruleset b/stylecop.ruleset index 864c188d..fa835e21 100644 --- a/stylecop.ruleset +++ b/stylecop.ruleset @@ -117,10 +117,10 @@ - + - + From 5e4d548a40af2f0baa66f130633f0d7958c6a413 Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Tue, 25 Jul 2017 22:48:40 +0200 Subject: [PATCH 14/19] Enabled compliant rules in the SA15 block. --- stylecop.ruleset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stylecop.ruleset b/stylecop.ruleset index fa835e21..f346e6f1 100644 --- a/stylecop.ruleset +++ b/stylecop.ruleset @@ -136,7 +136,7 @@ - + From 4739d53bfcdc2fb002650ac9832b8103d5de9779 Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Tue, 25 Jul 2017 22:49:20 +0200 Subject: [PATCH 15/19] Move exception rule to its corresponding block. --- stylecop.ruleset | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/stylecop.ruleset b/stylecop.ruleset index f346e6f1..3715914c 100644 --- a/stylecop.ruleset +++ b/stylecop.ruleset @@ -39,6 +39,7 @@ + @@ -190,9 +191,5 @@ - - - - \ No newline at end of file From c80c17036b2f90307a1640f366b8d5cfc381efbf Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Tue, 25 Jul 2017 23:24:34 +0200 Subject: [PATCH 16/19] Added three undocumented rules. --- stylecop.ruleset | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stylecop.ruleset b/stylecop.ruleset index 3715914c..218f7bb6 100644 --- a/stylecop.ruleset +++ b/stylecop.ruleset @@ -110,6 +110,7 @@ + @@ -177,6 +178,7 @@ + @@ -188,6 +190,7 @@ + From ab8f2826e79dea5046ad4d4f64a3cba19b64b735 Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Tue, 25 Jul 2017 23:32:26 +0200 Subject: [PATCH 17/19] Drop Link attribute in favor of Link tag to allow building with MSBuild 14 --- src/Generator.Bind/Generator.Bind.csproj | 8 ++++++-- src/Generator.Converter/Generator.Convert.csproj | 8 ++++++-- src/Generator.Rewrite/Generator.Rewrite.csproj | 8 ++++++-- src/OpenTK.GLControl/OpenTK.GLControl.csproj | 8 ++++++-- src/OpenTK.GLWidget/OpenTK.GLWidget.csproj | 8 ++++++-- src/OpenTK/OpenTK.Android.csproj | 8 ++++++-- src/OpenTK/OpenTK.csproj | 8 ++++++-- src/OpenTK/OpenTK.iOS.csproj | 8 ++++++-- 8 files changed, 48 insertions(+), 16 deletions(-) diff --git a/src/Generator.Bind/Generator.Bind.csproj b/src/Generator.Bind/Generator.Bind.csproj index 5f2f1f2a..0e5e172d 100644 --- a/src/Generator.Bind/Generator.Bind.csproj +++ b/src/Generator.Bind/Generator.Bind.csproj @@ -240,8 +240,12 @@ - - + + stylecop.json + + + stylecop.ruleset + diff --git a/src/Generator.Converter/Generator.Convert.csproj b/src/Generator.Converter/Generator.Convert.csproj index ae5427aa..7f4138e4 100644 --- a/src/Generator.Converter/Generator.Convert.csproj +++ b/src/Generator.Converter/Generator.Convert.csproj @@ -112,8 +112,12 @@ - - + + stylecop.json + + + stylecop.ruleset + diff --git a/src/Generator.Rewrite/Generator.Rewrite.csproj b/src/Generator.Rewrite/Generator.Rewrite.csproj index 4f15dd09..087a77ff 100644 --- a/src/Generator.Rewrite/Generator.Rewrite.csproj +++ b/src/Generator.Rewrite/Generator.Rewrite.csproj @@ -66,8 +66,12 @@ - - + + stylecop.json + + + stylecop.ruleset +