Converted InheritDocLib to a shared project

firesharkstudios · Oct 23, 2018 · d2be7d2 · d2be7d2
1 parent 58baf13
commit d2be7d2
Show file tree

Hide file tree

Showing 14 changed files with 91 additions and 95 deletions.
diff --git a/InheritDoc.sln b/InheritDoc.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2010
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InheritDoc", "InheritDoc\InheritDoc.csproj", "{8D70AD37-9599-474B-B231-5447DDFBFD31}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InheritDoc", "InheritDoc\InheritDoc.csproj", "{8D70AD37-9599-474B-B231-5447DDFBFD31}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{31F77A66-10E2-4705-B16D-9A2DDB6ED1C2}"
 	ProjectSection(SolutionItems) = preProject
@@ -13,8 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		release.txt = release.txt
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InheritDocLib", "InheritDocLib\InheritDocLib.csproj", "{390F170D-8730-4114-A3DA-EDA42541DA86}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InheritDocTest", "InheritDocTest\InheritDocTest.csproj", "{CA4B94C3-0C7A-4392-A20F-79A60C7CB38A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InheritDocVsix", "InheritDocVsix\InheritDocVsix.csproj", "{ACA5ADAF-6AC8-4EB7-A417-AEB141C102CD}"
@@ -40,7 +38,14 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "www.inheritdoc.io", "www.in
 		SlnRelativePath = "www.inheritdoc.io\"
 	EndProjectSection
 EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "InheritDocLib", "InheritDocLib\InheritDocLib.shproj", "{49BBB881-A047-4A28-9586-D5FFFA083806}"
+EndProject
 Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		InheritDocLib\InheritDocLib.projitems*{49bbb881-a047-4a28-9586-d5fffa083806}*SharedItemsImports = 13
+		InheritDocLib\InheritDocLib.projitems*{aca5adaf-6ac8-4eb7-a417-aeb141c102cd}*SharedItemsImports = 4
+		InheritDocLib\InheritDocLib.projitems*{ca4b94c3-0c7a-4392-a20f-79a60c7cb38a}*SharedItemsImports = 4
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
@@ -50,10 +55,6 @@ Global
 		{8D70AD37-9599-474B-B231-5447DDFBFD31}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8D70AD37-9599-474B-B231-5447DDFBFD31}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8D70AD37-9599-474B-B231-5447DDFBFD31}.Release|Any CPU.Build.0 = Release|Any CPU
-		{390F170D-8730-4114-A3DA-EDA42541DA86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{390F170D-8730-4114-A3DA-EDA42541DA86}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{390F170D-8730-4114-A3DA-EDA42541DA86}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{390F170D-8730-4114-A3DA-EDA42541DA86}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CA4B94C3-0C7A-4392-A20F-79A60C7CB38A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CA4B94C3-0C7A-4392-A20F-79A60C7CB38A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CA4B94C3-0C7A-4392-A20F-79A60C7CB38A}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/InheritDoc/InheritDoc.csproj b/InheritDoc/InheritDoc.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <Version>2.0.0.0</Version>
+        <Version>2.0.1</Version>
         <Description>Command line tool that post processes XML documentation files to support an <inheritdoc /> tag allowing inheriting XML comments from base types, interfaces, and similar methods. Works with .NET Framework, .NET Standard, and .NET Core projects. See the separate InheritDocLib NuGet package for a programmatic interface.</Description>
         <Company>Fireshark Studios, LLC</Company>
         <Copyright>Copyright ©  2017-2018</Copyright>
@@ -14,7 +14,7 @@
         <ApplicationIcon />
         <OutputType>Exe</OutputType>
         <StartupObject />
-        <PackageReleaseNotes>Converted InheritDocLib to support both .NET Core and .NET Framework</PackageReleaseNotes>
+        <PackageReleaseNotes>Changed InheritDocLib to shared project to avoid loading issues for VSIX</PackageReleaseNotes>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(GlobalTool)' != true">
@@ -41,11 +41,8 @@
 
     <ItemGroup>
         <PackageReference Include="CommandLineParser" Version="2.3.0" />
-        <PackageReference Include="NLog" Version="4.5.8" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\InheritDocLib\InheritDocLib.csproj" />
+        <PackageReference Include="Mono.Cecil" Version="0.10.1" />
+        <PackageReference Include="NLog" Version="4.5.10" />
     </ItemGroup>
 
     <ItemGroup>
@@ -58,4 +55,6 @@
       </None>
     </ItemGroup>
 
+    <Import Project="..\InheritDocLib\InheritDocLib.projitems" Label="Shared" />
+
 </Project>
diff --git a/InheritDocLib/InheritDocLib.csproj b/InheritDocLib/InheritDocLib.csproj
diff --git a/InheritDocLib/InheritDocLib.projitems b/InheritDocLib/InheritDocLib.projitems
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>49bbb881-a047-4a28-9586-d5fffa083806</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>InheritDocLib</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)DictionaryX.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)FileX.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)IEnumerableX.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)InheritDocUtil.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)StringX.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)XElementX.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)README.md" />
+  </ItemGroup>
+</Project>
diff --git a/InheritDocLib/InheritDocLib.shproj b/InheritDocLib/InheritDocLib.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>49bbb881-a047-4a28-9586-d5fffa083806</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="InheritDocLib.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/InheritDocLib/Key.snk b/InheritDocLib/Key.snk
diff --git a/InheritDocLib/packages.config b/InheritDocLib/packages.config
diff --git a/InheritDocTest/InheritDocTest.csproj b/InheritDocTest/InheritDocTest.csproj
@@ -47,8 +47,20 @@
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\MSTest.TestFramework.1.1.18\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
     </Reference>
+    <Reference Include="Mono.Cecil, Version=0.10.1.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.10.1\lib\net40\Mono.Cecil.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil.Mdb, Version=0.10.1.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.10.1\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil.Pdb, Version=0.10.1.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.10.1\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil.Rocks, Version=0.10.1.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.10.1\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
+    </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.8\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.4.5.10\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -71,12 +83,6 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\InheritDocLib\InheritDocLib.csproj">
-      <Project>{390f170d-8730-4114-a3da-eda42541da86}</Project>
-      <Name>InheritDocLib</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -87,4 +93,5 @@
     <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets'))" />
   </Target>
   <Import Project="..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets')" />
+  <Import Project="..\InheritDocLib\InheritDocLib.projitems" Label="Shared" />
 </Project>
diff --git a/InheritDocTest/packages.config b/InheritDocTest/packages.config
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Mono.Cecil" version="0.10.1" targetFramework="net461" />
   <package id="MSTest.TestAdapter" version="1.1.18" targetFramework="net461" />
   <package id="MSTest.TestFramework" version="1.1.18" targetFramework="net461" />
-  <package id="NLog" version="4.5.8" targetFramework="net461" />
+  <package id="NLog" version="4.5.10" targetFramework="net461" />
   <package id="NuGet.CommandLine" version="4.7.1" targetFramework="net461" developmentDependency="true" />
 </packages>
diff --git a/InheritDocVsix/InheritDocVsix.csproj b/InheritDocVsix/InheritDocVsix.csproj
@@ -160,6 +160,18 @@
     <Reference Include="Microsoft.VisualStudio.Validation, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.VisualStudio.Validation.15.3.15\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
     </Reference>
+    <Reference Include="Mono.Cecil, Version=0.10.1.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.10.1\lib\net40\Mono.Cecil.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil.Mdb, Version=0.10.1.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.10.1\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil.Pdb, Version=0.10.1.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.10.1\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil.Rocks, Version=0.10.1.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.10.1\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -172,6 +184,7 @@
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
@@ -180,13 +193,6 @@
       <ManifestResourceName>VSPackage</ManifestResourceName>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\InheritDocLib\InheritDocLib.csproj">
-      <Project>{390f170d-8730-4114-a3da-eda42541da86}</Project>
-      <Name>InheritDocLib</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.9\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.9\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" />
@@ -198,7 +204,8 @@
     <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets'))" />
   </Target>
-  <Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets')" />  
+  <Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets')" />
+  <Import Project="..\InheritDocLib\InheritDocLib.projitems" Label="Shared" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/InheritDocVsix/packages.config b/InheritDocVsix/packages.config
@@ -19,4 +19,5 @@
   <package id="Microsoft.VisualStudio.Utilities" version="15.0.26606" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Validation" version="15.3.15" targetFramework="net46" />
   <package id="Microsoft.VSSDK.BuildTools" version="15.1.192" targetFramework="net46" developmentDependency="true" />
+  <package id="Mono.Cecil" version="0.10.1" targetFramework="net46" />
 </packages>
diff --git a/InheritDocVsix/source.extension.vsixmanifest b/InheritDocVsix/source.extension.vsixmanifest
@@ -1,26 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="InheritDocVsix.75c8936d-7a76-4cc0-baed-4ecabc3b9e10" Version="2.0.0" Language="en-US" Publisher="Fireshark Studios, LLC" />
+        <Identity Id="InheritDocVsix.75c8936d-7a76-4cc0-baed-4ecabc3b9e10" Version="2.0.1" Language="en-US" Publisher="Fireshark Studios, LLC" />
         <DisplayName>InheritDoc</DisplayName>
         <Description xml:space="preserve">Allows using &lt;inheritdoc/&gt; tags in XML comments that copy and extend the XML comments from base types and interfaces
     </Description>
         <MoreInfo>http://www.inheritdoc.com/</MoreInfo>
         <GettingStartedGuide>index.html</GettingStartedGuide>
-        <ReleaseNotes>Converted InheritDocLib to support both .NET Core and .NET Framework</ReleaseNotes>
+        <ReleaseNotes>Changed InheritDocLib to shared project to avoid loading issues for VSIX</ReleaseNotes>
         <Tags>inheritdoc inherit copy extend xml comments</Tags>
     </Metadata>
     <Installation>
         <InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[12.0,15.0]" />
         <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[12.0,15.0]" />
         <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[12.0,15.0]" />
     </Installation>
-    <Dependencies>
-        <!--
-        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
-        <Dependency Id="Microsoft.VisualStudio.MPF.15.0" DisplayName="Visual Studio MPF 15.0" d:Source="Installed" Version="[15.0]" />
-    -->
-    </Dependencies>
     <Prerequisites>
         <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[12.0,16.0)" DisplayName="Visual Studio core editor" />
     </Prerequisites>

diff --git a/generate-nuget-packages.ps1 b/generate-nuget-packages.ps1
@@ -1,3 +1,3 @@
 dotnet pack -c Release -o \NuGet.local .\InheritDoc
 dotnet pack -c Release -o \NuGet.local .\InheritDoc /p:GlobalTool=true
-dotnet pack -c Release -o \NuGet.local .\InheritDocLib
+#dotnet pack -c Release -o \NuGet.local .\InheritDocLib