Merge pull request #4 from Rookiestyle/clickable-plugin-url-on-mono

Make plugin url clickable on Mono

Author: Rookiestyle

src/EarlyUpdateCheck.csproj

@@ -5,13 +5,9 @@
     <LangVersion>5</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <!-- For building .plgx -->
-    <PlgxConfiguration>
-      <Prerequisites>
-        <KeePassVersion>2.31</KeePassVersion>
-        <DotNetVersion>4.0</DotNetVersion>
-      </Prerequisites>
-    </PlgxConfiguration>
+    <PlgxKeePassVersion>2.38</PlgxKeePassVersion>
+    <PlgXOS>
+    </PlgXOS>
   </PropertyGroup>
   <PropertyGroup>
     <ProjectGuid>{78C152F3-EAF8-4FFC-9BE3-F5DC0CD66E5D}</ProjectGuid>
@@ -22,7 +18,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>EarlyUpdateCheck</RootNamespace>
     <AssemblyName>EarlyUpdateCheck</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <NoWin32Manifest>False</NoWin32Manifest>
     <SignAssembly>False</SignAssembly>
@@ -51,29 +47,16 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <StartAction>Project</StartAction>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <DebugSymbols>False</DebugSymbols>
-    <DebugType>None</DebugType>
-    <Optimize>False</Optimize>
-    <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <DefineConstants>TRACE</DefineConstants>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleasePlgx|AnyCPU' ">
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\KeePass_Release\Plugins\</OutputPath>
+    <OutputPath>bin\Release</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <OutputPath>..\..\KeePass_Debug\Plugins\</OutputPath>
+    <OutputPath>..\..\_KeePass_Debug\Plugins\</OutputPath>
     <Prefer32Bit>false</Prefer32Bit>
     <DebugType>full</DebugType>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <DebugType>pdbonly</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="CheckedGroupBox.cs" />
     <Compile Include="TranslationUpdateForm.cs">
@@ -102,21 +85,17 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="KeePass">
-      <Version>2.45.0.30441</Version>
-      <ExcludeFromPlgx />
-    </PackageReference>
-    <PackageReference Include="PlgxTool">
-      <Version>1.0.0</Version>
-      <ExcludeFromPlgx />
-    </PackageReference>
+    <ProjectReference Include="..\..\_KeePass_Source\KeePass\KeePass.csproj">
+      <Project>{10938016-dee2-4a25-9a5a-8fd3444379ca}</Project>
+      <Name>KeePass</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="AfterBuild" Condition="'$(Configuration)' == 'ReleasePlgx'">
-    <CallTarget Targets="BuildPlgx" />
-    <Delete Files="$(OutDir)Keepass.xml" />
-    <Delete Files="$(OutDir)Keepass.exe" />
-    <Delete Files="$(OutDir)Keepass.config.xml" />
-    <Delete Files="$(OutDir)EarlyUpdateCheck.dll" />
+  <Target Name="BeforeBuild" Condition=" '$(Configuration)' == 'Debug' ">
+    <Exec Command="..\translationcopy.cmd $(Configuration)" />
+  </Target>
+  <Target Name="AfterBuild" Condition=" '$(Configuration)' == 'ReleasePlgx' ">
+    <Exec Command="..\translationcopy.cmd $(Configuration)" />
+    <Exec Command="..\plgxcreate.cmd $(TargetFrameworkVersion.Replace('v', '')) $(PlgxKeePassVersion) $(PlgXOS)" />
   </Target>
 </Project>

src/PluginTools.cs

@@ -226,7 +226,7 @@ private static void AddPluginToOverview(string sPluginName, TabControl tcPlugins
 			GetLoadedPluginsName().TryGetValue(sPluginName.Replace("Ext", string.Empty) + "." + sPluginName, out v);
 			string ver = v.ToString();
 			if (ver.EndsWith(".0")) ver = ver.Substring(0, ver.Length - 2);
-			else ver += " (Dev)"; 
+			else ver += " (Dev)";
 			lvi.SubItems.Add(ver);
 			lv.Items.Add(lvi);
 			tcPlugins.TabPages.Remove(tpOverview);
@@ -291,7 +291,7 @@ public static void ShowOptions()
 		private static void AddPluginLink(UserControl uc)
 		{
 			LinkLabel llUrl = new LinkLabel();
-			llUrl.Links.Add(0, 0, PluginURL);
+			llUrl.Links.Add(0, PluginURL.Length, PluginURL);
 			llUrl.Text = PluginURL;
 			uc.Controls.Add(llUrl);
 			llUrl.Dock = DockStyle.Bottom;
@@ -488,8 +488,8 @@ public static Image Scale(Image img, int x, int y)
 
 	public static class PluginDebug
 	{
-		[Flags] 
-		public enum LogLevelFlags 
+		[Flags]
+		public enum LogLevelFlags
 		{
 			None = 0,
 			Info = 1,
@@ -517,7 +517,7 @@ public static bool DebugMode
 				if (m_DebugMode == value) return;
 				bool b = m_DebugMode;
 				m_DebugMode = true;
-				AddInfo("DebugMode changed", "Old: " + b.ToString(), "New: "+value.ToString());
+				AddInfo("DebugMode changed", "Old: " + b.ToString(), "New: " + value.ToString());
 				m_DebugMode = value;
 			}
 		}
@@ -536,7 +536,7 @@ static PluginDebug()
 			ulong uInst = KeePass.Util.WinUtil.GetMaxNetFrameworkVersion();
 			DotNetVersion = new Version(StrUtil.VersionToString(uInst));
 			RegistryKey rkRel = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full", false);
-			try	{ m_DotNetRelease = (int)rkRel.GetValue("Release"); }
+			try { m_DotNetRelease = (int)rkRel.GetValue("Release"); }
 			catch { }
 			if (rkRel != null) rkRel.Close();
 
@@ -705,7 +705,7 @@ public static void SaveOrShow()
 		{
 			if (m_DebugEntries.Count == 0) return;
 			SaveDebugMessages();
-			if (AutoOpen || (AskOpen && Tools.AskYesNo("DebugFile: "+DebugFile+"\n\nOpen debug file?") == DialogResult.Yes))
+			if (AutoOpen || (AskOpen && Tools.AskYesNo("DebugFile: " + DebugFile + "\n\nOpen debug file?") == DialogResult.Yes))
 				System.Diagnostics.Process.Start(DebugFile);
 		}
 
@@ -871,7 +871,7 @@ public void GetXml(System.Xml.XmlWriter xw)
 					foreach (var f in sf)
 					{
 						xw.WriteStartElement("StackFrame");
-						xw.WriteElementString("Method", f.GetMethod().Name + " ("+ f.GetMethod().DeclaringType.FullName + ")");
+						xw.WriteElementString("Method", f.GetMethod().Name + " (" + f.GetMethod().DeclaringType.FullName + ")");
 						xw.WriteElementString("FileName", System.IO.Path.GetFileName(f.GetFileName()));
 						xw.WriteElementString("Line", f.GetFileLineNumber().ToString());
 						xw.WriteEndElement();

src/Properties/AssemblyInfo.cs

@@ -24,6 +24,6 @@
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("2.0.1")]
-[assembly: AssemblyFileVersion("2.0.1")]
+[assembly: AssemblyVersion("2.0.2")]
+[assembly: AssemblyFileVersion("2.0.2")]
 [assembly: Guid("672570AF-CC57-4980-86F9-D48FD1CC707D")]

version.info

@@ -1,5 +1,5 @@
 :
-Early update check:2.0.1
+Early update check:2.0.2
 Early update check!de:3
 Early update check!ru:2
 :