Fixed SD2-1044: Semi-colon in MSBuild properties encoded when project saved

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1760 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/SharpDbTools/Project/Configuration/AssemblyInfo.cs

@@ -17,17 +17,5 @@ using System.Runtime.CompilerServices;
 [assembly: AssemblyTitle("SharpDbTools")]
 [assembly: AssemblyDescription("Addin for SharpDevelop 2.0")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SharpDevelop")]
-[assembly: AssemblyCopyright("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]

src/AddIns/Misc/SharpDbTools/Project/SharpDbTools.addin

@@ -3,6 +3,10 @@
        url         = ""
        description = "A collection of components and tools to help develop db-aware apps">
 	
+	<Manifest>
+		<Identity name = "ICSharpCode.SharpDbTools"/>
+	</Manifest>
+	
 	<Runtime>
 		<Import assembly = "SharpDbTools.dll"/>
 	</Runtime>

src/AddIns/Misc/SharpDbTools/Project/SharpDbTools.csproj

@@ -70,6 +70,9 @@
     <EmbeddedResource Include="Src\GetConnectionLogicalNameDialog.resx">
       <DependentUpon>GetConnectionLogicalNameDialog.cs</DependentUpon>
     </EmbeddedResource>
+    <Compile Include="..\..\..\..\Main\GlobalAssemblyInfo.cs">
+      <Link>Configuration\GlobalAssemblyInfo.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Src\Model" />
@@ -85,4 +88,4 @@
     <Folder Include="Src\Viewer" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-</Project>
+</Project>

src/AddIns/Misc/SharpDbTools/Project/Src/Model/DbModelInfo.cs

@@ -67,7 +67,7 @@ namespace SharpDbTools.Model
 				try {
 					invariantName = table.Rows[0][ColumnNames.InvariantName] as string;	
 				}
-				catch(ArgumentException e) {
+				catch(ArgumentException) {
 					// see comment below - it is correct to bury this exception
 				}
 				return invariantName;
@@ -100,7 +100,7 @@ namespace SharpDbTools.Model
 				try {
 					connectionString = table.Rows[0][ColumnNames.ConnectionString] as string;	
 				}
-				catch(ArgumentException e) {
+				catch(ArgumentException) {
 					// this simply indicates that this attribute was not defined when the
 					// DbModelInfo was saved, returning null makes sense here - so it is
 					// correct to bury this exception

src/Main/Base/Project/Src/Project/Items/ProjectItem.cs

@@ -153,7 +153,7 @@ namespace ICSharpCode.SharpDevelop.Project
 				if (c == '%') {
 					if (b == null) b = new StringBuilder(text, 0, i, text.Length + 6);
 					b.Append("%25");
-				} else if (c == ';') {
+				} else if (escapeSemicolon && c == ';') {
 					if (b == null) b = new StringBuilder(text, 0, i, text.Length + 6);
 					b.Append("%3b");
 				} else {