Move ILSpy distribution to subfolder inside VSIX.

ILSpy.AddIn/Commands/OpenILSpyCommand.cs

@@ -50,7 +50,7 @@ namespace ICSharpCode.ILSpy.AddIn.Commands
 		protected string GetILSpyPath()
 		{
 			var basePath = Path.GetDirectoryName(typeof(ILSpyAddInPackage).Assembly.Location);
-			return Path.Combine(basePath, "ILSpy.exe");
+			return Path.Combine(basePath, "ILSpy", "ILSpy.exe");
 		}
 
 		protected void OpenAssembliesInILSpy(ILSpyParameters parameters)

ILSpy.AddIn/ILSpy.AddIn.csproj

@@ -51,10 +51,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ILSpy\ILSpy.csproj" />
+    <ProjectReference Include="..\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj" />
+    <ProjectReference Include="..\ILSpy\ILSpy.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <Private>false</Private>
+    </ProjectReference>
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Include="..\ILSpy\NativeMethods.cs" Link="NativeMethods.cs" />
     <Compile Include="Commands\AssemblyReferenceForILSpy.cs" />
     <Compile Include="Commands\NuGetReferenceForILSpy.cs" />
     <Compile Include="Commands\ProjectItemForILSpy.cs" />
@@ -101,38 +106,19 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <AdditionalDependencies Include="$(ILSpyBuildPath)System.Collections.Immutable.dll" />
+    <Content Include="$(OutputPath)Mono.Cecil.dll">
-    <AdditionalDependencies Include="$(ILSpyBuildPath)System.Composition.AttributedModel.dll" />
+      <IncludeInVSIX>true</IncludeInVSIX>
-    <AdditionalDependencies Include="$(ILSpyBuildPath)System.Composition.Convention.dll" />
+      <VSIXSubPath>\</VSIXSubPath>
-    <AdditionalDependencies Include="$(ILSpyBuildPath)System.Composition.Hosting.dll" />
+    </Content>
-    <AdditionalDependencies Include="$(ILSpyBuildPath)System.Composition.Runtime.dll" />
-    <AdditionalDependencies Include="$(ILSpyBuildPath)System.Composition.TypedParts.dll" />
-    <AdditionalDependencies Include="$(ILSpyBuildPath)System.Threading.Tasks.Dataflow.dll" />
-    <AdditionalDependencies Include="$(ILSpyBuildPath)ICSharpCode.AvalonEdit.dll" />
-    <AdditionalDependencies Include="$(ILSpyBuildPath)Humanizer.dll" />
-    <AdditionalDependencies Include="$(ILSpyBuildPath)System.Reflection.Metadata.dll" />
-    <AdditionalDependencies Include="$(ILSpyBuildPath)Microsoft.VisualStudio.Composition.dll" />
-    <AdditionalDependencies Include="$(ILSpyBuildPath)Microsoft.VisualStudio.Validation.dll" />
-    <AdditionalDependencies Include="$(ILSpyBuildPath)Microsoft.Xaml.Behaviors.dll" />
-    <AdditionalDependencies Include="$(ILSpyBuildPath)Mono.Cecil.dll" />
-    <AdditionalDependencies Include="$(ILSpyBuildPath)Mono.Cecil.Pdb.dll" />
-    <AdditionalDependencies Include="$(ILSpyBuildPath)ILSpy.BamlDecompiler.Plugin.dll" />
-    <AdditionalDependencies Include="$(ILSpyBuildPath)Microsoft.DiaSymReader*.dll" />
-  	<AdditionalDependencies Include="$(ILSpyBuildPath)OSVersionHelper.dll" />
-    <AdditionalDependencies Include="$(ILSpyBuildPath)Xceed.Wpf.AvalonDock.dll" />
-    <AdditionalDependencies Include="$(ILSpyBuildPath)DataGridExtensions.dll" />  
-    <AdditionalDependencies Include="$(ILSpyBuildPath)Iced.dll" />  
-    <AdditionalDependencies Include="$(ILSpyBuildPath)ILCompiler.Reflection.ReadyToRun.dll" />  
-    <AdditionalDependencies Include="$(ILSpyBuildPath)ILSpy.ReadyToRun.Plugin.dll" />  
   </ItemGroup>
+  <!-- END WORKAROUND -->
 
   <ItemGroup>
-    <Content Include="@(AdditionalDependencies)">
+    <Content Include="$(ILSpyBuildPath)*.dll;$(ILSpyBuildPath)ILSpy.exe;$(ILSpyBuildPath)ILSpy.exe.config">
       <IncludeInVSIX>true</IncludeInVSIX>
-      <VSIXSubPath>\</VSIXSubPath>
+      <VSIXSubPath>\ILSpy</VSIXSubPath>
     </Content>
   </ItemGroup>
-  <!-- END WORKAROUND -->
 
   <ItemGroup>
     <None Include="ILSpyAddIn.vsct" />

ILSpy.AddIn/ILSpyInstance.cs

@@ -32,7 +32,7 @@ namespace ICSharpCode.ILSpy.AddIn
 		static string GetILSpyPath()
 		{
 			var basePath = Path.GetDirectoryName(typeof(ILSpyAddInPackage).Assembly.Location);
-			return Path.Combine(basePath, "ILSpy.exe");
+			return Path.Combine(basePath, "ILSpy", "ILSpy.exe");
 		}
 
 		public void Start()