fix plugin build

wakatime · Aug 15, 2016 · 83d0bb0 · 83d0bb0
1 parent cd13dd7
commit 83d0bb0
Show file tree

Hide file tree

Showing 30 changed files with 13,611 additions and 2,473 deletions.
diff --git a/WakaTime.sln b/WakaTime.sln
@@ -1,20 +1,20 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WakaTime", "WakaTime\WakaTime.csproj", "{A814BC59-0B22-45FC-9751-FCADC603B341}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WakaTime", "WakaTime\WakaTime.csproj", "{E56F6E12-089C-40ED-BCFD-923E5FA121A1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A814BC59-0B22-45FC-9751-FCADC603B341}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A814BC59-0B22-45FC-9751-FCADC603B341}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A814BC59-0B22-45FC-9751-FCADC603B341}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A814BC59-0B22-45FC-9751-FCADC603B341}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E56F6E12-089C-40ED-BCFD-923E5FA121A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E56F6E12-089C-40ED-BCFD-923E5FA121A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E56F6E12-089C-40ED-BCFD-923E5FA121A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E56F6E12-089C-40ED-BCFD-923E5FA121A1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/WakaTime/Constants.cs b/WakaTime/Constants.cs
@@ -1,19 +1,20 @@
 using System;
 using System.Net;
 using System.Text.RegularExpressions;
+using Kbg.NppPluginNET.PluginInfrastructure;
 
 namespace WakaTime
 {
     internal static class Constants
     {
-        internal const string NativeName = "WakaTime";
-        internal const string PluginName = "notepadpp-wakatime";
+        internal const string PluginName = "WakaTime";
+        internal const string PluginKey = "notepadpp-wakatime";
         internal static string PluginVersion = string.Format("{0}.{1}.{2}", WakaTimePackage.CoreAssembly.Version.Major, WakaTimePackage.CoreAssembly.Version.Minor, WakaTimePackage.CoreAssembly.Version.Build);
         internal const string EditorName = "notepadpp";
         internal static string EditorVersion {
             get
             {
-                var ver = (int)Win32.SendMessage(PluginBase.NppData._nppHandle, NppMsg.NPPM_GETNPPVERSION, 0, 0);
+                var ver = (int)Win32.SendMessage(PluginBase.nppData._nppHandle, (uint)NppMsg.NPPM_GETNPPVERSION, 0, 0);
                 return ver.ToString();
             }
         }

diff --git a/WakaTime/DllExport/NppPlugin.DllExport.targets b/WakaTime/DllExport/NppPlugin.DllExport.targets
diff --git a/WakaTime/Logger.cs b/WakaTime/Logger.cs
@@ -53,7 +53,7 @@ private static StreamWriter Setup()
             var configDir = Dependencies.AppDataDirectory;
             if (string.IsNullOrWhiteSpace(configDir)) return null;
 
-            var filename = string.Format("{0}\\{1}.log", configDir, Constants.NativeName);
+            var filename = string.Format("{0}\\{1}.log", configDir, Constants.PluginName);
             var writer = new StreamWriter(File.Open(filename, FileMode.Append, FileAccess.Write));
             return writer;
         }