Merge pull request #2503 from sharwell/cps-cleanup

CPS cleanup

Author: sharwell

StyleCop.Analyzers/Directory.build.props StyleCop.Analyzers/Directory.Build.propsStyleCop.Analyzers/Directory.build.props renamed to StyleCop.Analyzers/Directory.Build.props

@@ -6,6 +6,7 @@
     <Product>StyleCop.Analyzers</Product>
     <Company>Tunnel Vision Laboratories, LLC</Company>
     <Copyright>Copyright © Tunnel Vision Laboratories, LLC 2015</Copyright>
+    <NeutralLanguage>en-US</NeutralLanguage>
 
     <Version>1.1.0.35</Version>
     <FileVersion>1.1.0.35</FileVersion>

StyleCop.Analyzers/Directory.Build.targets

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+  <ItemGroup>
+    <!-- Enable code generation for resource files -->
+    <CodeGenerationEmbeddedResource Include="@(EmbeddedResource)" Exclude="**\*.??-??.resx" />
+    <EmbeddedResource Update="@(CodeGenerationEmbeddedResource)" Generator="ResXFileCodeGenerator" />
+  </ItemGroup>
+
+  <!-- Special handling for embedded resources and generated files to show as nested in Solution Explorer -->
+  <ItemGroup>
+    <!-- Update designer files for *.resx files -->
+    <Compile Update="@(CodeGenerationEmbeddedResource->'%(RecursiveDir)%(Filename).Designer.cs')" DependentUpon="$([System.IO.Path]::ChangeExtension($([System.IO.Path]::GetFileNameWithoutExtension(%(Identity))), '.resx'))" />
+
+    <!-- Localized embedded resources are just dependent on the parent RESX -->
+    <EmbeddedResource Update="**\*.??-??.resx" DependentUpon="$([System.IO.Path]::ChangeExtension($([System.IO.Path]::GetFileNameWithoutExtension(%(Identity))), '.resx'))" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="$(MSBuildProjectFileDirectory)$(AssemblyOriginatorKeyFile)" Link="%(Filename)%(Extension)" />
+  </ItemGroup>
+
+</Project>

StyleCop.Analyzers/Directory.build.targets

@@ -4,7 +4,6 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard1.1;net452</TargetFrameworks>
     <RootNamespace>StyleCop.Analyzers</RootNamespace>
-    <NeutralLanguage>en-US</NeutralLanguage>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <IncludeSymbols>true</IncludeSymbols>
     <NuspecFile>StyleCop.Analyzers.nuspec</NuspecFile>