WinGui: Add StyleCop.Analyzers NuGet package

6 files changed, 36 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index 43690ee47..c79b8f709 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ win/CS/*.VC.opendb
 win/CS/*.VC.db
 win/CS/**/*.Cache
 win/CS/**/*.user
+win/CS/packages/**/*
 
 # Xcode user data
 xcuserdata
diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
index 2db736f68..d4a03fe35 100644
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -184,9 +184,13 @@
     <Compile Include="Utilities\LanguageUtilities.cs" />

   </ItemGroup>

   <ItemGroup>

+    <AdditionalFiles Include="..\stylecop.json">

+      <Link>stylecop.json</Link>

+    </AdditionalFiles>

     <None Include="app.config" />

   </ItemGroup>

   <ItemGroup>

+    <None Include="packages.config" />

     <None Include="Properties\AssemblyInfo.cs.Nightly.tmpl" />

     <None Include="Properties\AssemblyInfo.cs.tmpl" />

   </ItemGroup>

@@ -197,7 +201,11 @@
       <SubType>Designer</SubType>

     </EmbeddedResource>

   </ItemGroup>

-  <ItemGroup />

+  <ItemGroup>

+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\Newtonsoft.Json.dll" />

+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />

+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />

+  </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.

diff --git a/win/CS/HandBrake.ApplicationServices/packages.config b/win/CS/HandBrake.ApplicationServices/packages.config
new file mode 100644
index 000000000..f8377218f
--- /dev/null
+++ b/win/CS/HandBrake.ApplicationServices/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="StyleCop.Analyzers" version="1.1.0-beta001" targetFramework="net46" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 64d9c6a62..a20854234 100644
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -470,6 +470,9 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

       <SubType>Designer</SubType>

     </EmbeddedResource>

+    <AdditionalFiles Include="..\stylecop.json">

+      <Link>stylecop.json</Link>

+    </AdditionalFiles>

     <None Include="app.config" />

     <None Include="app.manifest" />

     <None Include="Installer\Installer.nsi" />

@@ -478,6 +481,7 @@
     <None Include="Installer\MakeNightly64.nsi" />

     <AppDesigner Include="Properties\" />

     <EmbeddedResource Include="public.key" />

+    <None Include="packages.config" />

     <None Include="portable.ini.template">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </None>

@@ -703,7 +707,11 @@
   <ItemGroup>

     <Resource Include="Views\Images\information64.png" />

   </ItemGroup>

-  <ItemGroup />

+  <ItemGroup>

+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\Newtonsoft.Json.dll" />

+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll" />

+    <Analyzer Include="..\packages\StyleCop.Analyzers.1.1.0-beta001\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />

+  </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.

diff --git a/win/CS/HandBrakeWPF/packages.config b/win/CS/HandBrakeWPF/packages.config
new file mode 100644
index 000000000..f8377218f
--- /dev/null
+++ b/win/CS/HandBrakeWPF/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="StyleCop.Analyzers" version="1.1.0-beta001" targetFramework="net46" developmentDependency="true" />
+</packages>
\ No newline at end of file
diff --git a/win/CS/stylecop.json b/win/CS/stylecop.json
new file mode 100644
index 000000000..0f4c75219
--- /dev/null
+++ b/win/CS/stylecop.json
@@ -0,0 +1,9 @@
+{
+  "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json",
+  "settings": {
+    "documentationRules": {
+      "companyName": "HandBrake Project (http://handbrake.fr)",
+      "copyrightText": "This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License."
+    }
+  }
+}