From 458a9e58ea308e949667e0777d64fa201023411c Mon Sep 17 00:00:00 2001
From: tpodolak <misiek767@gmail.com>
Date: Sun, 3 Jun 2018 17:04:48 +0200
Subject: [PATCH] [GH-2] - hacking csprojs to include shared project during
 dotnet pack

---
 Directory.Build.props                              |  2 +-
 .../NSubstitute.Analyzers.CSharp.csproj            |  8 +++++++-
 .../NSubstitute.Analyzers.Shared.csproj            |  1 +
 .../NSubstitute.Analyzers.VisualBasic.csproj       | 14 +++++++++++++-
 .../NSubstitute.Analyzers.Tests.CSharp.csproj      |  1 +
 .../NSubstitute.Analyzers.Tests.VisualBasic.csproj |  1 +
 6 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 96644aa6..5c609505 100644
--- 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>
\ No newline at end of file
diff --git a/src/NSubstitute.Analyzers.CSharp/NSubstitute.Analyzers.CSharp.csproj b/src/NSubstitute.Analyzers.CSharp/NSubstitute.Analyzers.CSharp.csproj
index bb34c693..afeda64c 100644
--- 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>
\ No newline at end of file
diff --git a/src/NSubstitute.Analyzers.Shared/NSubstitute.Analyzers.Shared.csproj b/src/NSubstitute.Analyzers.Shared/NSubstitute.Analyzers.Shared.csproj
index 7cf84cfe..c522f101 100644
--- 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
index d5760fc8..77e03cfd 100644
--- 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>
\ No newline at end of file
diff --git a/tests/NSubstitute.Analyzers.Tests.CSharp/NSubstitute.Analyzers.Tests.CSharp.csproj b/tests/NSubstitute.Analyzers.Tests.CSharp/NSubstitute.Analyzers.Tests.CSharp.csproj
index b4893474..ecb9ddf1 100644
--- 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>
\ No newline at end of file
diff --git a/tests/NSubstitute.Analyzers.Tests.VisualBasic/NSubstitute.Analyzers.Tests.VisualBasic.csproj b/tests/NSubstitute.Analyzers.Tests.VisualBasic/NSubstitute.Analyzers.Tests.VisualBasic.csproj
index cb6a988f..97b6ffbe 100644
--- 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>