Generalize the analayzer inclusion to the target file

dotnet · Sep 24, 2018 · d8b4f9e · d8b4f9e
1 parent a39b1f7
commit d8b4f9e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 19 deletions.
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -3,10 +3,9 @@
   <Import Project="..\Directory.Build.targets" />
 
   <Target Name="PreparePackageAssets"
-          AfterTargets="Build"
-          Condition="'$(IncludeInPackage)' != ''">
+          AfterTargets="Build">
 
-    <ItemGroup>
+    <ItemGroup Condition="'$(IncludeInPackage)' != ''">
       <PackageAsset Include="$(TargetPath)"
                     RelativePath="$(IncludeInPackage)\lib\$(TargetFramework)" />
       <PackageAsset Include="@(DebugSymbolsProjectOutputGroupOutput)"
@@ -15,6 +14,13 @@
                     RelativePath="$(IncludeInPackage)\lib\$(TargetFramework)" />
     </ItemGroup>
 
+    <ItemGroup Condition="'$(IncludeAnalyzerInPackage)' != ''">
+      <PackageAsset Include="$(TargetPath)"
+                    RelativePath="$(IncludeAnalyzerInPackage)\analyzers\dotnet\cs" />
+      <PackageAsset Include="@(DebugSymbolsProjectOutputGroupOutput)"
+                    RelativePath="$(IncludeAnalyzerInPackage)\analyzers\dotnet\cs" />
+    </ItemGroup>
+
     <Copy SourceFiles="@(PackageAsset)"
           DestinationFolder="$(PackageAssetsPath)%(PackageAsset.RelativePath)" />
 

diff --git a/src/Microsoft.ML.Analyzer/Microsoft.ML.Analyzer.csproj b/src/Microsoft.ML.Analyzer/Microsoft.ML.Analyzer.csproj
@@ -5,22 +5,6 @@
     <IncludeAnalyzerInPackage>Microsoft.ML</IncludeAnalyzerInPackage>
   </PropertyGroup>
 
-  <Target Name="PrepareAnalyzerPackageAssets"
-          AfterTargets="Build">
-
-    <ItemGroup>
-      <PackageAsset Include="$(TargetPath)"
-                    RelativePath="$(IncludeAnalyzerInPackage)\analyzers\dotnet\cs" />
-      <PackageAsset Include="@(DebugSymbolsProjectOutputGroupOutput)"
-                    RelativePath="$(IncludeAnalyzerInPackage)\analyzers\dotnet\cs" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(PackageAsset)"
-          DestinationFolder="$(PackageAssetsPath)%(PackageAsset.RelativePath)" />
-
-  </Target>
-
-
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
     <PackageReference Include="Microsoft.CSharp" Version="$(MicrosoftCSharpVersion)" />