From 8322d412f07d495fcfc030fcfa88624f226f4b36 Mon Sep 17 00:00:00 2001
From: Mark Monteiro <marknr.monteiro@protonmail.com>
Date: Sun, 3 May 2020 16:51:39 -0400
Subject: Move ruleset up one directory so it can be shared by all test
 projects

---
 MediaBrowser.sln                                   |  3 +++
 .../MediaBrowser.Api.Tests.csproj                  |  2 +-
 .../MediaBrowser.Api.Tests.ruleset                 | 22 ----------------------
 tests/jellyfin-tests.ruleset                       | 22 ++++++++++++++++++++++
 4 files changed, 26 insertions(+), 23 deletions(-)
 delete mode 100644 tests/MediaBrowser.Api.Tests/MediaBrowser.Api.Tests.ruleset
 create mode 100644 tests/jellyfin-tests.ruleset

diff --git a/MediaBrowser.sln b/MediaBrowser.sln
index 05d13816b1..18e578fb66 100644
--- a/MediaBrowser.sln
+++ b/MediaBrowser.sln
@@ -49,6 +49,9 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jellyfin.Api", "Jellyfin.Api\Jellyfin.Api.csproj", "{DFBEFB4C-DA19-4143-98B7-27320C7F7163}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FBBB5129-006E-4AD7-BAD5-8B7CA1D10ED6}"
+	ProjectSection(SolutionItems) = preProject
+		tests\jellyfin-tests.ruleset = tests\jellyfin-tests.ruleset
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jellyfin.Common.Tests", "tests\Jellyfin.Common.Tests\Jellyfin.Common.Tests.csproj", "{DF194677-DFD3-42AF-9F75-D44D5A416478}"
 EndProject
diff --git a/tests/MediaBrowser.Api.Tests/MediaBrowser.Api.Tests.csproj b/tests/MediaBrowser.Api.Tests/MediaBrowser.Api.Tests.csproj
index 8ae110c32c..f30e486900 100644
--- a/tests/MediaBrowser.Api.Tests/MediaBrowser.Api.Tests.csproj
+++ b/tests/MediaBrowser.Api.Tests/MediaBrowser.Api.Tests.csproj
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <CodeAnalysisRuleSet>MediaBrowser.Api.Tests.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>../jellyfin-tests.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
 </Project>
diff --git a/tests/MediaBrowser.Api.Tests/MediaBrowser.Api.Tests.ruleset b/tests/MediaBrowser.Api.Tests/MediaBrowser.Api.Tests.ruleset
deleted file mode 100644
index 5cf77ac4c3..0000000000
--- a/tests/MediaBrowser.Api.Tests/MediaBrowser.Api.Tests.ruleset
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="Rules for MediaBrowser.Api.Tests" Description="Code analysis rules for MediaBrowser.Api.Tests.csproj" ToolsVersion="14.0">
-
-  <!-- Include the solution default RuleSet. The rules in this file will override the defaults. -->
-  <Include Path="../../jellyfin.ruleset" Action="Default" />
-
-  <!-- StyleCop Analyzer Rules -->
-  <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
-    <!-- SA0001: XML comment analysis is disabled due to project configuration -->
-    <Rule Id="SA0001" Action="None" />
-  </Rules>
-
-  <!-- FxCop Analyzer Rules -->
-  <Rules AnalyzerId="Microsoft.CodeAnalysis.FxCopAnalyzers" RuleNamespace="Microsoft.Design">
-    <!-- CA1707: Identifiers should not contain underscores -->
-    <Rule Id="CA1707" Action="None" />
-    <!-- CA2007: Consider calling ConfigureAwait on the awaited task -->
-    <Rule Id="CA2007" Action="None" />
-    <!-- CA2234: Pass system uri objects instead of strings -->
-    <Rule Id="CA2234" Action="Info" />      
-  </Rules>
-</RuleSet>
diff --git a/tests/jellyfin-tests.ruleset b/tests/jellyfin-tests.ruleset
new file mode 100644
index 0000000000..5a113e955e
--- /dev/null
+++ b/tests/jellyfin-tests.ruleset
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="Rules for MediaBrowser.Api.Tests" Description="Code analysis rules for MediaBrowser.Api.Tests.csproj" ToolsVersion="14.0">
+
+  <!-- Include the solution default RuleSet. The rules in this file will override the defaults. -->
+  <Include Path="../jellyfin.ruleset" Action="Default" />
+
+  <!-- StyleCop Analyzer Rules -->
+  <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
+    <!-- SA0001: XML comment analysis is disabled due to project configuration -->
+    <Rule Id="SA0001" Action="None" />
+  </Rules>
+
+  <!-- FxCop Analyzer Rules -->
+  <Rules AnalyzerId="Microsoft.CodeAnalysis.FxCopAnalyzers" RuleNamespace="Microsoft.Design">
+    <!-- CA1707: Identifiers should not contain underscores -->
+    <Rule Id="CA1707" Action="None" />
+    <!-- CA2007: Consider calling ConfigureAwait on the awaited task -->
+    <Rule Id="CA2007" Action="None" />
+    <!-- CA2234: Pass system uri objects instead of strings -->
+    <Rule Id="CA2234" Action="Info" />      
+  </Rules>
+</RuleSet>
-- 
cgit v1.2.3