Add analayzer to nuget (#999)

* Add analayzer to nuget * Generalize target file to enable easier analayzer inclusions in future
dotnet · Sep 24, 2018 · fe07907 · fe07907
1 parent eb26489
commit fe07907
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/pkg/Directory.Build.props b/pkg/Directory.Build.props
@@ -31,6 +31,7 @@
 
   <ItemGroup>
     <Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\lib\**\*" Pack="true" PackagePath="lib" />
+    <Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\analyzers\**\*" Pack="true" PackagePath="analyzers" />
     <Content Include="$(PackageAssetsPath)$(PackageIdFolderName)\runtimes\**\*" Pack="true" PackagePath="runtimes" />
   </ItemGroup>
 

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
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard1.3</TargetFramework>
+    <IncludeAnalyzerInPackage>Microsoft.ML</IncludeAnalyzerInPackage>
   </PropertyGroup>
 
   <ItemGroup>