Browse Source

[ILSpy.AddIn] Fix missing libraries in vsix.

pull/870/head
Siegfried Pammer 8 years ago
parent
commit
9d0a2138dc
  1. 1
      .gitignore
  2. 11
      ILSpy.AddIn/ILSpy.AddIn.csproj
  3. 2
      ILSpy.AddIn/Utils.cs
  4. 12
      ILSpy/ILSpy.csproj

1
.gitignore vendored

@ -10,3 +10,4 @@ _ReSharper*/ @@ -10,3 +10,4 @@ _ReSharper*/
*.ReSharper
*.patch
.vs/
/ILSpy.AddIn/Packages/*

11
ILSpy.AddIn/ILSpy.AddIn.csproj

@ -84,6 +84,13 @@ @@ -84,6 +84,13 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Content Include="Packages/*">
<IncludeInVSIX>true</IncludeInVSIX>
<VSIXSubPath>\</VSIXSubPath>
</Content>
</ItemGroup>
<ItemGroup>
<None Include="source.extension.vsixmanifest">
<SubType>Designer</SubType>
@ -134,4 +141,8 @@ @@ -134,4 +141,8 @@
<ProjectReference Update="@(ProjectReference)" Name="%(Filename)" />
</ItemGroup>
<ItemGroup>
<Folder Include="Packages\" />
</ItemGroup>
</Project>

2
ILSpy.AddIn/Utils.cs

@ -5,7 +5,7 @@ using System.Text; @@ -5,7 +5,7 @@ using System.Text;
namespace ICSharpCode.ILSpy.AddIn
{
class Utils
static class Utils
{
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1060:MovePInvokesToNativeMethodsClass")]
[DllImport("shell32.dll", SetLastError = true, CharSet = CharSet.Unicode)]

12
ILSpy/ILSpy.csproj

@ -382,4 +382,16 @@ @@ -382,4 +382,16 @@
</PropertyGroup>
</Target>
<!--
Workaround: nuget packages do not get added to the vsix automatically.
Copy them to a local folder and then include them as Content-items in the AddIn.
(related to https://github.com/icsharpcode/ILSpy/issues/511)
-->
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="mkdir $(SolutionDir)ILSpy.AddIn\packages\" IgnoreExitCode="true" />
<Exec Command="copy $(TargetDir)\System.ValueTuple.dll $(SolutionDir)\ILSpy.AddIn\packages\" />
<Exec Command="copy $(TargetDir)\System.Collections.Immutable.dll $(SolutionDir)\ILSpy.AddIn\packages\" />
<Exec Command="copy $(TargetDir)\ICSharpCode.AvalonEdit.dll $(SolutionDir)\ILSpy.AddIn\packages\" />
<Exec Command="copy $(TargetDir)\Newtonsoft.Json.dll $(SolutionDir)\ILSpy.AddIn\packages\" />
</Target>
</Project>
Loading…
Cancel
Save