Added DllExport files to NppGist.csproj.

KvanTTT · Nov 4, 2017 · 7142c06 · 7142c06
1 parent bb0f541
commit 7142c06
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 11 deletions.
diff --git a/NppGist.Tests/NppGist.Tests.csproj b/NppGist.Tests/NppGist.Tests.csproj
@@ -23,6 +23,7 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
     <PlatformTarget>x86</PlatformTarget>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -63,7 +64,9 @@
     <None Include="Data\gists.json" />
     <None Include="Data\user-full.json" />
     <None Include="Data\user.json" />
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NppGist\NppGist.csproj">

diff --git a/NppGist/DllExport/DllExportAttribute.cs b/NppGist/DllExport/DllExportAttribute.cs
@@ -9,22 +9,28 @@ partial class DllExportAttribute : Attribute
         public DllExportAttribute()
         {
         }
+
         public DllExportAttribute(string exportName)
             : this(exportName, CallingConvention.StdCall)
         {
         }
+
         public DllExportAttribute(string exportName, CallingConvention callingConvention)
         {
             ExportName = exportName;
             CallingConvention = callingConvention;
         }
+
         CallingConvention _callingConvention;
+
         public CallingConvention CallingConvention
         {
             get { return _callingConvention; }
             set { _callingConvention = value; }
         }
+
         string _exportName;
+
         public string ExportName
         {
             get { return _exportName; }

diff --git a/NppGist/Forms/frmAbout.Designer.cs b/NppGist/Forms/frmAbout.Designer.cs
diff --git a/NppGist/Forms/frmAbout.cs b/NppGist/Forms/frmAbout.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using System.Reflection;
 using System.Windows.Forms;
 
 namespace NppGist.Forms
@@ -8,6 +9,7 @@ public partial class frmAbout : Form
         public frmAbout()
         {
             InitializeComponent();
+            lblName.Text = "NppGist " + Assembly.GetExecutingAssembly().GetName().Version;
         }
 
         private void linkSource_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)

diff --git a/NppGist/NppGist.csproj b/NppGist/NppGist.csproj
@@ -51,6 +51,7 @@
     <ErrorReport>prompt</ErrorReport>
     <PlatformTarget>x86</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -173,6 +174,7 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <None Include="DllExport\NppPlugin.DllExport.targets" />
     <None Include="packages.config" />
     <None Include="Resources\refresh.png" />
   </ItemGroup>
@@ -188,6 +190,11 @@
   <ItemGroup>
     <EmbeddedResource Include="ServiceStack.Text.dll" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="DllExport\Mono.Cecil.dll" />
+    <Content Include="DllExport\NppPlugin.DllExport.dll" />
+    <Content Include="DllExport\NppPlugin.DllExport.MSBuild.dll" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildProjectDirectory)\DllExport\NppPlugin.DllExport.targets" />
   <PropertyGroup>