re-removed Rubberduck.Parsing.Inspection.Resources namespace

rubberduck-vba · May 11, 2018 · 25d9f5d · 25d9f5d
1 parent e1dba32
commit 25d9f5d
Show file tree

Hide file tree

Showing 14 changed files with 9 additions and 510 deletions.
diff --git a/Rubberduck.Core/Settings/CodeInspectionSettings.cs b/Rubberduck.Core/Settings/CodeInspectionSettings.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Xml.Serialization;
 using Rubberduck.Parsing.Inspections.Abstract;
+using Rubberduck.Parsing.Inspections;
 using Rubberduck.Parsing.Inspections.Resources;
 
 namespace Rubberduck.Settings

diff --git a/Rubberduck.Inspections/Inspector.cs b/Rubberduck.Inspections/Inspector.cs
@@ -12,11 +12,9 @@
 using NLog;
 using Rubberduck.Parsing.Inspections;
 using Rubberduck.Parsing.Inspections.Abstract;
-using Rubberduck.Parsing.Inspections.Resources;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Resources;
 using Rubberduck.Settings;
-using Rubberduck.UI;
 using Rubberduck.UI.Inspections;
 using Rubberduck.VBEditor;
 

diff --git a/Rubberduck.Parsing/Inspections/Abstract/IInspectionModel.cs b/Rubberduck.Parsing/Inspections/Abstract/IInspectionModel.cs
@@ -1,4 +1,4 @@
-using Rubberduck.Parsing.Inspections.Resources;
+using Rubberduck.Parsing.Inspections;
 
 namespace Rubberduck.Parsing.Inspections.Abstract
 {

diff --git a/...tions/Resources/CodeInspectionSeverity.cs → ...ing/Inspections/CodeInspectionSeverity.cs b/...tions/Resources/CodeInspectionSeverity.cs → ...ing/Inspections/CodeInspectionSeverity.cs
@@ -1,4 +1,4 @@
-namespace Rubberduck.Parsing.Inspections.Resources
+namespace Rubberduck.Parsing.Inspections
 {
     public enum CodeInspectionSeverity
     {

diff --git a/...spections/Resources/CodeInspectionType.cs → ...Parsing/Inspections/CodeInspectionType.cs b/...spections/Resources/CodeInspectionType.cs → ...Parsing/Inspections/CodeInspectionType.cs
@@ -1,4 +1,4 @@
-namespace Rubberduck.Parsing.Inspections.Resources
+namespace Rubberduck.Parsing.Inspections
 {
     public enum CodeInspectionType
     {

diff --git a/Rubberduck.Parsing/Inspections/Resources/InspectionsUI.cs.resx b/Rubberduck.Parsing/Inspections/Resources/InspectionsUI.cs.resx
diff --git a/Rubberduck.Parsing/Rubberduck.Parsing.csproj b/Rubberduck.Parsing/Rubberduck.Parsing.csproj
@@ -169,11 +169,6 @@
     <Compile Include="Inspections\Abstract\IInspector.cs" />
     <Compile Include="Inspections\Abstract\IParseTreeInspection.cs" />
     <Compile Include="Inspections\Abstract\IQuickFix.cs" />
-    <Compile Include="Inspections\Resources\InspectionsUI.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>InspectionsUI.resx</DependentUpon>
-    </Compile>
     <Compile Include="Inspections\PropertyBag.cs" />
     <Compile Include="Symbols\ParsingExceptions\MainParseExceptionErrorListener.cs" />
     <Compile Include="Symbols\ParsingExceptions\PreprocessorExceptionErrorListener.cs" />
@@ -188,18 +183,8 @@
     <Compile Include="VBA\ParsePass.cs" />
     <Compile Include="Inspections\CannotAnnotateAttribute.cs" />
     <Compile Include="Inspections\RequiredLibraryAttribute.cs" />
-    <Compile Include="Inspections\Resources\CodeInspectionSeverity.cs" />
-    <Compile Include="Inspections\Resources\CodeInspectionType.cs" />
-    <Compile Include="Inspections\Resources\InspectionsUI.de.Designer.cs">
-      <DependentUpon>InspectionsUI.de.resx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Inspections\Resources\InspectionsUI.fr.Designer.cs">
-      <DependentUpon>InspectionsUI.fr.resx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
+    <Compile Include="Inspections\CodeInspectionSeverity.cs" />
+    <Compile Include="Inspections\CodeInspectionType.cs" />
     <Compile Include="Rewriter\MemberAttributesRewriter.cs" />
     <Compile Include="Rewriter\RewriterInfo\ConstantRewriterInfoFinder.cs" />
     <Compile Include="Rewriter\RewriterInfo\DefaultRewriterInfoFinder.cs" />
@@ -439,21 +424,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Inspections\Resources\InspectionsUI.de.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>InspectionsUI.de.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Inspections\Resources\InspectionsUI.fr.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>InspectionsUI.fr.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Inspections\Resources\InspectionsUI.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <SubType>Designer</SubType>
-      <LastGenOutput>InspectionsUI.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
     <EmbeddedResource Include="ParsingText.de.resx" />
     <EmbeddedResource Include="ParsingText.fr.resx" />
     <EmbeddedResource Include="ParsingText.resx">
@@ -467,6 +437,7 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

diff --git a/...tions/Resources/InspectionsUI.Designer.cs → ...ces/Inspections/InspectionsUI.Designer.cs b/...tions/Resources/InspectionsUI.Designer.cs → ...ces/Inspections/InspectionsUI.Designer.cs
diff --git a/...ns/Resources/InspectionsUI.de.Designer.cs → .../Inspections/InspectionsUI.de.Designer.cs b/...ns/Resources/InspectionsUI.de.Designer.cs → .../Inspections/InspectionsUI.de.Designer.cs
diff --git a/...spections/Resources/InspectionsUI.de.resx → ...sources/Inspections/InspectionsUI.de.resx b/...spections/Resources/InspectionsUI.de.resx → ...sources/Inspections/InspectionsUI.de.resx
diff --git a/...ns/Resources/InspectionsUI.fr.Designer.cs → .../Inspections/InspectionsUI.fr.Designer.cs b/...ns/Resources/InspectionsUI.fr.Designer.cs → .../Inspections/InspectionsUI.fr.Designer.cs
diff --git a/...spections/Resources/InspectionsUI.fr.resx → ...sources/Inspections/InspectionsUI.fr.resx b/...spections/Resources/InspectionsUI.fr.resx → ...sources/Inspections/InspectionsUI.fr.resx
diff --git a/.../Inspections/Resources/InspectionsUI.resx → ....Resources/Inspections/InspectionsUI.resx b/.../Inspections/Resources/InspectionsUI.resx → ....Resources/Inspections/InspectionsUI.resx
diff --git a/Rubberduck.Resources/Rubberduck.Resources.csproj b/Rubberduck.Resources/Rubberduck.Resources.csproj
@@ -307,12 +307,12 @@
       <LastGenOutput>RegexAssistantUI.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <EmbeddedResource Include="Inspections\InspectionsUI.de.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
+      <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>InspectionsUI.de.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Inspections\InspectionsUI.fr.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
+      <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>InspectionsUI.fr.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>