[GH-2] - hacking csprojs to include shared project during dotnet pack

nsubstitute · Jun 3, 2018 · 458a9e5 · 458a9e5
1 parent 46a4104
commit 458a9e5
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 3 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,6 +7,6 @@
         <AdditionalFiles Include="../../StyleCop.json" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
+        <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
     </ItemGroup>
 </Project>
diff --git a/src/NSubstitute.Analyzers.CSharp/NSubstitute.Analyzers.CSharp.csproj b/src/NSubstitute.Analyzers.CSharp/NSubstitute.Analyzers.CSharp.csproj
@@ -29,6 +29,12 @@
     <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NSubstitute.Analyzers.Shared\NSubstitute.Analyzers.Shared.csproj" />
+    <ProjectReference Include="..\NSubstitute.Analyzers.Shared\NSubstitute.Analyzers.Shared.csproj" PrivateAssets="all" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="$(OutputPath)\NSubstitute.Analyzers.Shared.dll">
+      <Pack>true</Pack>
+      <PackagePath>analyzers/dotnet/cs</PackagePath>
+    </Content>
   </ItemGroup>
 </Project>
diff --git a/src/NSubstitute.Analyzers.Shared/NSubstitute.Analyzers.Shared.csproj b/src/NSubstitute.Analyzers.Shared/NSubstitute.Analyzers.Shared.csproj
@@ -5,6 +5,7 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <GenerateAssemblyInfo>True</GenerateAssemblyInfo>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="1.3.2" />

diff --git a/src/NSubstitute.Analyzers.VisualBasic/NSubstitute.Analyzers.VisualBasic.csproj b/src/NSubstitute.Analyzers.VisualBasic/NSubstitute.Analyzers.VisualBasic.csproj
@@ -29,6 +29,18 @@
     <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/vb" Visible="false" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NSubstitute.Analyzers.Shared\NSubstitute.Analyzers.Shared.csproj" />
+    <ProjectReference Include="..\NSubstitute.Analyzers.Shared\NSubstitute.Analyzers.Shared.csproj" PrivateAssets="all"/>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="$(OutputPath)\NSubstitute.Analyzers.Shared.dll">
+      <Pack>true</Pack>
+      <PackagePath>lib\$(TargetFramework)</PackagePath>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="$(OutputPath)\NSubstitute.Analyzers.Shared.dll">
+      <Pack>true</Pack>
+      <PackagePath>analyzers/dotnet/vb</PackagePath>
+    </Content>
   </ItemGroup>
 </Project>
diff --git a/tests/NSubstitute.Analyzers.Tests.CSharp/NSubstitute.Analyzers.Tests.CSharp.csproj b/tests/NSubstitute.Analyzers.Tests.CSharp/NSubstitute.Analyzers.Tests.CSharp.csproj
@@ -12,6 +12,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\NSubstitute.Analyzers.CSharp\NSubstitute.Analyzers.CSharp.csproj" />
+    <ProjectReference Include="..\..\src\NSubstitute.Analyzers.Shared\NSubstitute.Analyzers.Shared.csproj" />
     <ProjectReference Include="..\NSubstitute.Analyzers.Tests.Shared\NSubstitute.Analyzers.Tests.Shared.csproj" />
   </ItemGroup>
 </Project>
diff --git a/tests/NSubstitute.Analyzers.Tests.VisualBasic/NSubstitute.Analyzers.Tests.VisualBasic.csproj b/tests/NSubstitute.Analyzers.Tests.VisualBasic/NSubstitute.Analyzers.Tests.VisualBasic.csproj
@@ -11,6 +11,7 @@
     <PackageReference Include="xunit" Version="2.3.1" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\src\NSubstitute.Analyzers.Shared\NSubstitute.Analyzers.Shared.csproj" />
     <ProjectReference Include="..\..\src\NSubstitute.Analyzers.VisualBasic\NSubstitute.Analyzers.VisualBasic.csproj" />
     <ProjectReference Include="..\NSubstitute.Analyzers.Tests.Shared\NSubstitute.Analyzers.Tests.Shared.csproj" />
   </ItemGroup>