Merged SD 2.2 revision 2560:2603 to trunk.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2604 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
18 years ago · 9bad98d6e4
33 changed files with 984 additions and 343 deletions
--- a/data/templates/file/CSharp/CSharp.EmptyClass.xft
+++ b/data/templates/file/CSharp/CSharp.EmptyClass.xft
@ -20,7 +20,7 @@
 		${Path}                     -> Full path of the file
 		${ClassName}                -> Class name (generally FileNameWithoutExtension w/o 'bad' characters)
 	-->
-	<Properties>
+	<!--<Properties>
 		<Property
 			name          = "IsSealed"
 			localizedName = "${res:Templates.File.Properties.IsSealed}"
@ -29,7 +29,7 @@
 			category      = "${res:Templates.File.Properties.ContextCategory}"
 			description   = "${res:Templates.File.Properties.IsSealed.Description}"
 		/>
-	</Properties>
+	</Properties>-->
 	<Files>
 		<File name="${FullName}" language="C#"><![CDATA[${StandardHeader.C#}
@ -41,7 +41,7 @@ namespace ${StandardNamespace}
 	/// <summary>
 	/// Description of ${ClassName}.
 	/// </summary>
-	public <% if (IsSealed) { %>sealed <% } %>class ${ClassName}
+	public class ${ClassName}
 	{
 		public ${ClassName}()
 		{
--- a/doc/SharpDevelopInfoResources.txt
+++ b/doc/SharpDevelopInfoResources.txt
@ -6,22 +6,23 @@ http://community.sharpdevelop.net/forums/
 ++ WIKI ++
 http://wiki.sharpdevelop.net/ (HOME)
-http://wiki.sharpdevelop.net/default.aspx/SharpDevelop.FeatureVideos
+http://wiki.sharpdevelop.net/SharpDevelopSites.ashx (sites and servers)
-http://wiki.sharpdevelop.net/default.aspx/SharpDevelop.HowToDoThings
+http://wiki.sharpdevelop.net/ScreenRecordingsForDevelopers.ashx
 ++ ROADMAPS ++
-http://wiki.sharpdevelop.net/default.aspx/SharpDevelop.SharpDevelop2xRoadmap
+http://wiki.sharpdevelop.net/RoadmapVersion2x.ashx
 http://wiki.sharpdevelop.net/RoadmapVersion3x.ashx
 ++ HELPING ++
-http://wiki.sharpdevelop.net/default.aspx/SharpDevelop.HowCanIHelp
+http://wiki.sharpdevelop.net/JoiningTheTeam.ashx
-http://wiki.sharpdevelop.net/default.aspx/SharpDevelop.FeaturesYouCouldHelpUsWith
+http://wiki.sharpdevelop.net/FeaturesWeSolicitHelpFor.ashx
 ++ WISH LIST ++
-http://wiki.sharpdevelop.net/default.aspx/SharpDevelop.SharpDevelopWishList
+http://wiki.sharpdevelop.net/Wishlist.ashx
--- a/doc/copyright.txt
+++ b/doc/copyright.txt
@ -1,4 +1,4 @@
-Copyright 2002-2006 by
+Copyright 2002-2007 by
  AlphaSierraPapa, Christoph Wille
  Vordernberger Strasse 27/8
--- a/doc/readme.rtf
+++ b/doc/readme.rtf
@ -1,18 +1,18 @@
 {\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f1\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Arial;}
 {\f2\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;}{\f3\fbidi \froman\fcharset2\fprq2{\*\panose 05050102010706020507}Symbol;}{\f10\fbidi \fnil\fcharset2\fprq2{\*\panose 05000000000000000000}Wingdings;}
 {\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}{\f39\fbidi \fswiss\fcharset0\fprq2{\*\panose 00000000000000000000}Albany{\*\falt Arial};}{\f40\fbidi \fnil\fcharset2\fprq0{\*\panose 00000000000000000000}StarSymbol;}
-{\f41\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0603030804020204}Bitstream Vera Sans;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\f41\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0603030804020204}Bitstream Vera Sans{\*\falt Malgun Gothic};}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
 {\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhimajor\f31502\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria;}
 {\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
-{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhiminor\f31506\fbidi \froman\fcharset0\fprq0{\*\panose 020f0502020204030204}Calibri;}
+{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}
-{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f42\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\f43\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f223\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\f224\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\f45\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f46\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f47\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f48\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\f226\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f227\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f228\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f229\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
-{\f49\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f50\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f52\fbidi \fswiss\fcharset238\fprq2 Arial CE;}{\f53\fbidi \fswiss\fcharset204\fprq2 Arial Cyr;}
+{\f230\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f231\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f233\fbidi \fswiss\fcharset238\fprq2 Arial CE;}{\f234\fbidi \fswiss\fcharset204\fprq2 Arial Cyr;}
-{\f55\fbidi \fswiss\fcharset161\fprq2 Arial Greek;}{\f56\fbidi \fswiss\fcharset162\fprq2 Arial Tur;}{\f57\fbidi \fswiss\fcharset177\fprq2 Arial (Hebrew);}{\f58\fbidi \fswiss\fcharset178\fprq2 Arial (Arabic);}
+{\f236\fbidi \fswiss\fcharset161\fprq2 Arial Greek;}{\f237\fbidi \fswiss\fcharset162\fprq2 Arial Tur;}{\f238\fbidi \fswiss\fcharset177\fprq2 Arial (Hebrew);}{\f239\fbidi \fswiss\fcharset178\fprq2 Arial (Arabic);}
-{\f59\fbidi \fswiss\fcharset186\fprq2 Arial Baltic;}{\f60\fbidi \fswiss\fcharset163\fprq2 Arial (Vietnamese);}{\f62\fbidi \fmodern\fcharset238\fprq1 Courier New CE;}{\f63\fbidi \fmodern\fcharset204\fprq1 Courier New Cyr;}
+{\f240\fbidi \fswiss\fcharset186\fprq2 Arial Baltic;}{\f241\fbidi \fswiss\fcharset163\fprq2 Arial (Vietnamese);}{\f243\fbidi \fmodern\fcharset238\fprq1 Courier New CE;}{\f244\fbidi \fmodern\fcharset204\fprq1 Courier New Cyr;}
-{\f65\fbidi \fmodern\fcharset161\fprq1 Courier New Greek;}{\f66\fbidi \fmodern\fcharset162\fprq1 Courier New Tur;}{\f67\fbidi \fmodern\fcharset177\fprq1 Courier New (Hebrew);}{\f68\fbidi \fmodern\fcharset178\fprq1 Courier New (Arabic);}
+{\f246\fbidi \fmodern\fcharset161\fprq1 Courier New Greek;}{\f247\fbidi \fmodern\fcharset162\fprq1 Courier New Tur;}{\f248\fbidi \fmodern\fcharset177\fprq1 Courier New (Hebrew);}{\f249\fbidi \fmodern\fcharset178\fprq1 Courier New (Arabic);}
-{\f69\fbidi \fmodern\fcharset186\fprq1 Courier New Baltic;}{\f70\fbidi \fmodern\fcharset163\fprq1 Courier New (Vietnamese);}{\f382\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f383\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}
+{\f250\fbidi \fmodern\fcharset186\fprq1 Courier New Baltic;}{\f251\fbidi \fmodern\fcharset163\fprq1 Courier New (Vietnamese);}{\f563\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f564\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}
-{\f385\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f386\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f389\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\f566\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f567\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f570\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
 {\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
 {\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
 {\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
@ -27,12 +27,14 @@
 {\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
 {\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
 {\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
-{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}
-{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}
-{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}
+{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
-{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;
+{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
-\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\*\defchp \fs22 }{\*\defpap \ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }
+{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;
-\noqfpromote {\stylesheet{\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 \sqformat \spriority0 Normal;}{
+\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;
 \red192\green192\blue192;}{\*\defchp \fs22 }{\*\defpap \ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{
 \ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 \sqformat \spriority0 Normal;}{
 \s1\ql \li0\ri0\sb240\sa60\keepn\nowidctlpar\wrapdefault\aspalpha\faauto\outlinelevel0\rin0\lin0\itap0 \rtlch\fcs1 \ab\af1\afs32\alang1025 \ltrch\fcs0 \b\fs32\cf1\lang1033\langfe255\loch\f1\hich\af0\dbch\af0\cgrid\langnp1033\langfenp255 
 \sbasedon17 \snext17 \slink15 \sqformat heading 1;}{\s2\ql \li0\ri0\sb240\sa60\keepn\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel1\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\ai\af1\afs28\alang1025 \ltrch\fcs0 
 \b\i\f1\fs28\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \slink16 \sqformat \styrsid16001860 heading 2;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\*
@ -68,10 +70,11 @@ WW-Absatz-Standardschriftart;}{\*\cs25 \additive \cf1\lang0\langfe255\loch\f3\la
 \'01\u-3929 ?;}{\levelnumbers;}\f10\hres0\chhres0 \fi-360\li4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow2\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\hres0\chhres0 
 \fi-360\li5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow2\levelstartat1\levelspace0\levelindent0{\leveltext\'01o;}{\levelnumbers;}\f2\hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0
 \leveljcn0\levelfollow2\levelstartat1\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}\f10\hres0\chhres0 \fi-360\li6480\lin6480 }{\listname WW8Num5;}\listid3}}{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}
-{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}}{\*\rsidtbl \rsid7266\rsid478716\rsid1325536\rsid1529975\rsid2386661\rsid3544784\rsid5133654\rsid5311771\rsid6836014\rsid8399799\rsid8998230\rsid10511801
+{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}}{\*\rsidtbl \rsid7266\rsid478716\rsid1325536\rsid1529975\rsid2108658\rsid2386661\rsid3544784\rsid4218794\rsid5133654\rsid5311771\rsid6836014\rsid8399799
-\rsid11565985\rsid11820290\rsid12669354\rsid13114330\rsid14104483\rsid14353066\rsid14357922\rsid14500044\rsid15205648\rsid15797313\rsid16001860\rsid16473051}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1
+\rsid8998230\rsid10511801\rsid11565985\rsid11820290\rsid12669354\rsid13114330\rsid14104483\rsid14353066\rsid14357922\rsid14500044\rsid15205648\rsid15797313\rsid16001860\rsid16391990\rsid16473051}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0
-\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\author Tom Verbeek}{\operator Christoph Wille}{\creatim\yr2001\mo5\dy7\hr17\min11}{\revtim\yr2007\mo3\dy6\hr21\min22}{\printim\yr2113\mo1\dy1}{\version14}{\edmins88}{\nofpages2}{\nofwords302}{\nofchars2228}
+\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\author Tom Verbeek}{\operator Christoph Wille}{\creatim\yr2001\mo5\dy7\hr17\min11}{\revtim\yr2007\mo6\dy27\hr8\min19}{\printim\yr2113\mo1\dy1}{\version15}{\edmins89}
-{\*\company AlphaSierraPapa}{\nofcharsws2525}{\vern32857}{\*\saveprevpict}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw11905\paperh16837\margl1134\margr1134\margt1134\margb1134\gutter0\ltrsect 
+{\nofpages3}{\nofwords301}{\nofchars2181}{\*\company AlphaSierraPapa}{\nofcharsws2478}{\vern32889}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}
 \paperw11905\paperh16837\margl1134\margr1134\margt1134\margb1134\gutter0\ltrsect 
 \deftab1250\widowctrl\ftnbj\aenddoc\trackmoves1\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0
 \noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\lytprtmet\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3
 \jcompress\viewkind1\viewscale100\nolnhtadjtbl\rsidroot6836014\notcvasp\notbrkcnstfrctbl\notvatxbx\krnprsnet\cachedcolbal \fet0{\*\wgrffmtfilter 2450}\ilfomacatclnup0\ltrpar \sectd \ltrsect\sbknone\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1
@ -80,9 +83,9 @@ WW-Absatz-Standardschriftart;}{\*\cs25 \additive \cf1\lang0\langfe255\loch\f3\la
 {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\s17\qc \li0\ri0\nowidctlpar\wrapdefault\aspalpha\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 
 \fs24\cf1\lang1033\langfe255\cgrid\langnp1033\langfenp255 {\rtlch\fcs1 \ab\af41\afs120 \ltrch\fcs0 \b\f41\fs120\insrsid14357922\charrsid14357922 SharpDevelop}{\rtlch\fcs1 \ab\af41\afs120 \ltrch\fcs0 \b\f41\fs120\insrsid14357922 
 \par }\pard \ltrpar\s17\qc \li0\ri0\nowidctlpar\wrapdefault\aspalpha\faauto\rin0\lin0\itap0\pararsid14357922 {\rtlch\fcs1 \ab\af41\afs120 \ltrch\fcs0 \b\f41\fs120\insrsid5133654\charrsid14357922 2}{\rtlch\fcs1 \ab\af41\afs120 \ltrch\fcs0 
-\b\f41\fs120\insrsid6836014\charrsid14357922 .}{\rtlch\fcs1 \ab\af41\afs120 \ltrch\fcs0 \b\f41\fs120\insrsid14357922\charrsid14357922 1
+\b\f41\fs120\insrsid6836014\charrsid14357922 .}{\rtlch\fcs1 \ab\af41\afs120 \ltrch\fcs0 \b\f41\fs120\insrsid2108658 2}{\rtlch\fcs1 \ab\af41\afs120 \ltrch\fcs0 \b\f41\fs120\insrsid14357922\charrsid14357922 
 \par }\pard \ltrpar\s17\ql \li0\ri0\nowidctlpar\wrapdefault\aspalpha\faauto\rin0\lin0\itap0 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid11820290 
-\par }\pard \ltrpar\s17\qc \li0\ri0\nowidctlpar\wrapdefault\aspalpha\faauto\rin0\lin0\itap0\pararsid6836014 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid1325536 {\*\shppict{\pict{\*\picprop\shplid1025{\sp{\sn shapeType}{\sv 75}}{\sp{\sn fFlipH}{\sv 0}}
+\par }\pard \ltrpar\s17\qc \li0\ri0\nowidctlpar\wrapdefault\aspalpha\faauto\rin0\lin0\itap0\pararsid6836014 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid4218794 {\*\shppict{\pict{\*\picprop\shplid1025{\sp{\sn shapeType}{\sv 75}}{\sp{\sn fFlipH}{\sv 0}}
 {\sp{\sn fFlipV}{\sv 0}}{\sp{\sn pibFlags}{\sv 2}}{\sp{\sn fLine}{\sv 0}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fLayoutInCell}{\sv 1}}}\picscalex100\picscaley100\piccropl0\piccropr0\piccropt0\piccropb0
 \picw14115\pich7763\picwgoal8002\pichgoal4401\pngblip\bliptag-992432282{\*\blipuid c4d8af66daa9b8284dc64b16077915b5}89504e470d0a1a0a0000000d4948445200000190000000dc0802000000d13060380000002c744558744372656174696f6e2054696d6500576564203130204170
 7220323030322031383a33303a3532202b3031303006027e470000000774494d4507d2040a101f3189bdfcf4000000097048597300000b1200000b1201d2dd7e
@ -7692,51 +7695,52 @@ ger, who }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid5311771 is the main developer an
 \ltrch\fcs0 \insrsid5311771 , who have helped a great deal to make the 1.0 release}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid11820290  a successful one}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid5311771  \endash 
 though it took us four years and a few architectural changes along the way.}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid11820290 
 \par 
-\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid14357922 What you got on your machine is now }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid11565985 version 2.1 \endash  a vastly enhanced product, and we encourage you to take the feature tour.}{\rtlch\fcs1 \af0 
+\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid14357922 What you got on your machine is now }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid11565985 version 2.}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid2108658 2}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid11565985  \endash 
-\ltrch\fcs0 \insrsid11820290 
+ a vastly enhanced product, and we encourage you to take the feature tour.}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid11820290 
 \par 
 \par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid13114330 
 \par }{\rtlch\fcs1 \ab\ai\af0 \ltrch\fcs0 \b\i\insrsid13114330\charrsid13114330 The #develop team
-\par }{\field{\*\fldinst {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid14104483  HYPERLINK "http://www.icsharpcode.net/pub/relations/team.aspx" }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid1325536 {\*\datafield 
+\par }{\field{\*\fldinst {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid14104483  HYPERLINK "http://www.icsharpcode.net/pub/relations/team.aspx" }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid4218794 {\*\datafield 
 00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b6600000068007400740070003a002f002f007700770077002e00690063007300680061007200700063006f00640065002e006e00650074002f007000750062002f00720065006c006100740069006f006e0073002f00
-7400650061006d002e006100730070007800000000000000}}}{\fldrslt {\rtlch\fcs1 \af0 \ltrch\fcs0 \cs28\ul\cf2\insrsid13114330\charrsid14104483 http://www.icsharpcode.net/pub/relations/team.aspx}}}\sectd \ltrsect\sbknone\linex0\sectdefaultcl\sftnbj {\rtlch\fcs1 
+7400650061006d002e00610073007000780000000000000000}}}{\fldrslt {\rtlch\fcs1 \af0 \ltrch\fcs0 \cs28\ul\cf2\insrsid13114330\charrsid14104483 http://www.icsharpcode.net/pub/relations/team.aspx}}}\sectd \ltrsect\sbknone\linex0\sectdefaultcl\sftnbj {
-\af0 \ltrch\fcs0 \insrsid13114330\charrsid13114330 
+\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid13114330\charrsid13114330 
-\par }{\field{\*\fldinst {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid14104483  HYPERLINK "http://wiki.sharpdevelop.net/default.aspx/SharpDevelop.Contributors" }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid1325536 {\*\datafield 
+\par }{\field{\*\fldinst {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid2108658  HYPERLINK "}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid2108658\charrsid2108658 http://wiki.sharpdevelop.net/Contributors.ashx}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid2108658 " }}{\fldrslt {
-00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b8800000068007400740070003a002f002f00770069006b0069002e007300680061007200700064006500760065006c006f0070002e006e00650074002f00640065006600610075006c0074002e006100730070007800
+\rtlch\fcs1 \af0 \ltrch\fcs0 \cs28\ul\cf2\insrsid2108658\charrsid9202661 http://wiki.sharpdevelop.net/Contributors.ashx}}}\sectd \ltrsect\sbknone\linex0\sectdefaultcl\sftnbj {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid11820290 
-2f005300680061007200700044006500760065006c006f0070002e0043006f006e007400720069006200750074006f0072007300000000000000}}}{\fldrslt {\rtlch\fcs1 \af0 \ltrch\fcs0 \cs28\ul\cf2\insrsid13114330\charrsid14104483 
+\par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid2108658 
 http://wiki.sharpdevelop.net/default.aspx/SharpDevelop.Contributors}}}\sectd \ltrsect\sbknone\linex0\sectdefaultcl\sftnbj {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid13114330\charrsid13114330 
 \par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid11820290 
 \par }\pard\plain \ltrpar\s1\ql \li0\ri0\sb240\sa60\keepn\nowidctlpar\wrapdefault\aspalpha\faauto\outlinelevel0\rin0\lin0\itap0\pararsid14500044 \rtlch\fcs1 \ab\af1\afs32\alang1025 \ltrch\fcs0 
 \b\fs32\cf1\lang1033\langfe255\loch\af1\hich\af0\dbch\af0\cgrid\langnp1033\langfenp255 {\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid14500044 \hich\af0\dbch\af0\loch\f1 Overview}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid11820290 
 \par }\pard\plain \ltrpar\s19\qj \fi1\li360\ri0\nowidctlpar\wrapdefault\aspalpha\faauto\rin0\lin360\itap0 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 \fs24\cf1\lang2057\langfe255\cgrid\langnp2057\langfenp255 {\rtlch\fcs1 \af0 \ltrch\fcs0 
 \insrsid8998230\charrsid8998230 #develop (short for SharpDevelop) is a free }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid8998230 Integrated Development Environment (IDE)}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid8998230\charrsid8998230  for C#}{\rtlch\fcs1 \af0 
-\ltrch\fcs0 \insrsid1529975 , }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid8998230\charrsid8998230  VB.NET}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid1529975 , Managed C++ and ILAsm}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid8998230\charrsid8998230 
+\ltrch\fcs0 \insrsid1529975 , }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid8998230\charrsid8998230  VB.NET}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid2108658  and Boo }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid8998230\charrsid8998230 
- projects on Microsoft's .NET platform.}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid8998230  It is written entirely in C#, and comes }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid1529975 with features you would expect in an IDE}{\rtlch\fcs1 \af0 \ltrch\fcs0 
+projects on Microsoft's .NET platform.}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid8998230  It is written }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid2108658 (almost) }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid8998230 entirely in C#, and comes }{\rtlch\fcs1 \af0 
-\insrsid16001860  plus a few more}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid1529975 .}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid14500044\charrsid8998230 
+\ltrch\fcs0 \insrsid1529975 with features you would expect in an IDE}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid16001860  plus a few more}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid1529975 .}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid14500044\charrsid8998230 
 \par }\pard\plain \ltrpar\s1\ql \li0\ri0\sb240\sa60\keepn\nowidctlpar\wrapdefault\aspalpha\faauto\outlinelevel0\rin0\lin0\itap0\pararsid14500044 \rtlch\fcs1 \ab\af1\afs32\alang1025 \ltrch\fcs0 
 \b\fs32\cf1\lang1033\langfe255\loch\af1\hich\af0\dbch\af0\cgrid\langnp1033\langfenp255 {\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid14500044 \hich\af0\dbch\af0\loch\f1 Features
 \par }\pard\plain \ltrpar\s17\ql \li0\ri0\nowidctlpar\wrapdefault\aspalpha\faauto\rin0\lin0\itap0\pararsid14357922 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 \fs24\cf1\lang1033\langfe255\cgrid\langnp1033\langfenp255 {\rtlch\fcs1 \af0 \ltrch\fcs0 
 \insrsid14357922 For detailed information on the features present in SharpDevelop, please take the feature tour:
 \par 
-\par }{\field{\*\fldinst {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid14357922  HYPERLINK "}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid14357922\charrsid14357922 http://www.icsharpcode.net/OpenSource/SD/Tour/}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid14357922 " }}{\fldrslt {
+\par }{\field{\*\fldinst {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid14357922  HYPERLINK "}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid14357922\charrsid14357922 http://www.icsharpcode.net/OpenSource/SD/Tour/}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid14357922 " }{\rtlch\fcs1 
-\rtlch\fcs1 \af0 \ltrch\fcs0 \cs28\ul\cf2\insrsid14357922\charrsid16391990 http://www.icsharpcode.net/OpenSource/SD/Tour/}}}\sectd \ltrsect\sbknone\linex0\sectdefaultcl\sftnbj {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid14357922 
+\af0 \ltrch\fcs0 \insrsid2108658 {\*\datafield 
 00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b7600000068007400740070003a002f002f007700770077002e00690063007300680061007200700063006f00640065002e006e00650074002f004f00700065006e0053006f0075007200630065002f00530044002f00
 54006f00750072002f000000795881f43b1d7f48af2c825dc485276300000000a5ab0000}}}{\fldrslt {\rtlch\fcs1 \af0 \ltrch\fcs0 \cs28\ul\cf2\insrsid14357922\charrsid16391990 http://www.icsharpcode.net/OpenSource/SD/Tour/}}}\sectd \ltrsect
 \sbknone\linex0\sectdefaultcl\sftnbj {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid14357922 
 \par }\pard\plain \ltrpar\s1\ql \li0\ri0\sb240\sa60\keepn\nowidctlpar\wrapdefault\aspalpha\faauto\outlinelevel0\rin0\lin0\itap0\pararsid14500044 \rtlch\fcs1 \ab\af1\afs32\alang1025 \ltrch\fcs0 
 \b\fs32\cf1\lang1033\langfe255\loch\af1\hich\af0\dbch\af0\cgrid\langnp1033\langfenp255 {\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid14500044 \hich\af0\dbch\af0\loch\f1 Support
 \par }\pard\plain \ltrpar\s19\qj \fi1\li360\ri0\nowidctlpar\wrapdefault\aspalpha\faauto\rin0\lin360\itap0 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 \fs24\cf1\lang2057\langfe255\cgrid\langnp2057\langfenp255 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid14104483 
 Our primary means of support is via our Web-based forum (please do not email team members directly unless they advise you to do so in the forum):}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid14500044 
 \par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid14104483 
 \par }\pard \ltrpar\s19\qj \fi1\li360\ri0\nowidctlpar\wrapdefault\aspalpha\faauto\rin0\lin360\itap0\pararsid14104483 {\field{\*\fldinst {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid10511801  HYPERLINK "}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid10511801\charrsid10511801 
-http://community.sharpdeve}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid10511801 lop.net/forums/" }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid1325536 {\*\datafield 
+http://community.sharpdeve}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid10511801 lop.net/forums/" }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid4218794 {\*\datafield 
 00d0c9ea79f9bace118c8200aa004ba90b02000000170000002a00000068007400740070003a002f002f0063006f006d006d0075006e006900740079002e007300680061007200700064006500760065006c006f0070002e006e00650074002f0066006f00720075006d0073002f000000e0c9ea79f9bace118c8200aa004b
-a90b5400000068007400740070003a002f002f0063006f006d006d0075006e006900740079002e007300680061007200700064006500760065006c006f0070002e006e00650074002f0066006f00720075006d0073002f00000000}}}{\fldrslt {\rtlch\fcs1 \af0 \ltrch\fcs0 
+a90b5400000068007400740070003a002f002f0063006f006d006d0075006e006900740079002e007300680061007200700064006500760065006c006f0070002e006e00650074002f0066006f00720075006d0073002f0000000000}}}{\fldrslt {\rtlch\fcs1 \af0 \ltrch\fcs0 
 \cs28\ul\cf2\insrsid10511801\charrsid3544784 http://community.sharpdevelop.net/forums/}}}\sectd \ltrsect\sbknone\linex0\sectdefaultcl\sftnbj {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid10511801  }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid14104483 
 \par 
 \par Before posting, we would like to encourage you to visit }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid10511801 our}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid14104483  Wiki pages:
 \par 
 \par }\pard \ltrpar\s19\qj \fi1\li360\ri0\nowidctlpar\wrapdefault\aspalpha\faauto\rin0\lin360\itap0\pararsid10511801 {\field{\*\fldinst {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid10511801  HYPERLINK "}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid10511801\charrsid10511801 
-http://wiki.sharp}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid10511801 develop.net/" }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid1325536 {\*\datafield 
+http://wiki.sharp}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid10511801 develop.net/" }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid4218794 {\*\datafield 
 00d0c9ea79f9bace118c8200aa004ba90b02000000170000001e00000068007400740070003a002f002f00770069006b0069002e007300680061007200700064006500760065006c006f0070002e006e00650074002f000000e0c9ea79f9bace118c8200aa004ba90b3c00000068007400740070003a002f002f0077006900
-6b0069002e007300680061007200700064006500760065006c006f0070002e006e00650074002f00000000}}}{\fldrslt {\rtlch\fcs1 \af0 \ltrch\fcs0 \cs28\ul\cf2\insrsid10511801\charrsid3544784 http://wiki.sharpdevelop.net/}}}\sectd \ltrsect
+6b0069002e007300680061007200700064006500760065006c006f0070002e006e00650074002f0000000000}}}{\fldrslt {\rtlch\fcs1 \af0 \ltrch\fcs0 \cs28\ul\cf2\insrsid10511801\charrsid3544784 http://wiki.sharpdevelop.net/}}}\sectd \ltrsect
 \sbknone\linex0\sectdefaultcl\sftnbj {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid14104483 
 \par }\pard \ltrpar\s19\qj \fi1\li360\ri0\nowidctlpar\wrapdefault\aspalpha\faauto\rin0\lin360\itap0\pararsid14104483 {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid14104483 
 \par When reporting bugs, please use the Bug Reporting forum and be sure to revisit the sticky topics on how to make good bug reports. Please provide us with steps to reproduce the error.  
@ -7749,10 +7753,10 @@ http://wiki.sharp}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid10511801 develop.net/" }
 \par }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid11820290 
 \par IC#Code }{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid10511801 FAQ: Open Source Licenses}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid11820290\charrsid11820290 
 \par }{\field{\*\fldinst {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid10511801  HYPERLINK "}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid10511801\charrsid10511801 http://community.sharpdevelop.net/forums/17/ShowForum.aspx}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid10511801 " }{
-\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid1325536 {\*\datafield 
+\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid4218794 {\*\datafield 
 00d0c9ea79f9bace118c8200aa004ba90b02000000170000003b00000068007400740070003a002f002f0063006f006d006d0075006e006900740079002e007300680061007200700064006500760065006c006f0070002e006e00650074002f0066006f00720075006d0073002f00310037002f00530068006f0077004600
 6f00720075006d002e0061007300700078000000e0c9ea79f9bace118c8200aa004ba90b7600000068007400740070003a002f002f0063006f006d006d0075006e006900740079002e007300680061007200700064006500760065006c006f0070002e006e00650074002f0066006f00720075006d0073002f00310037002f
-00530068006f00770046006f00720075006d002e006100730070007800000000}}}{\fldrslt {\rtlch\fcs1 \af0 \ltrch\fcs0 \cs28\ul\cf2\insrsid10511801\charrsid3544784 http://community.sharpdevelop.net/forums/17/ShowForum.aspx}}}\sectd \ltrsect
+00530068006f00770046006f00720075006d002e00610073007000780000000000}}}{\fldrslt {\rtlch\fcs1 \af0 \ltrch\fcs0 \cs28\ul\cf2\insrsid10511801\charrsid3544784 http://community.sharpdevelop.net/forums/17/ShowForum.aspx}}}\sectd \ltrsect
 \sbknone\linex0\sectdefaultcl\sftnbj {\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid11820290 
 \par }{\*\themedata 504b030414000600080000002100828abc13fa0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb6ac3301045f785fe83d0b6d8
 72ba28a5d8cea249777d2cd20f18e4b12d6a8f843409c9df77ecb850ba082d74231062ce997b55ae8fe3a00e1893f354e9555e6885647de3a8abf4fbee29bbd7
@ -7806,7 +7810,7 @@ c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100828abc
 617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169
 6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363
 656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e}
-{\*\latentstyles\lsdstimax266\lsdlockeddef0\lsdsemihiddendef1\lsdunhideuseddef1\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;
+{\*\latentstyles\lsdstimax267\lsdlockeddef0\lsdsemihiddendef1\lsdunhideuseddef1\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;
 \lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;
 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;
 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdpriority39 \lsdlocked0 toc 1;\lsdpriority39 \lsdlocked0 toc 2;\lsdpriority39 \lsdlocked0 toc 3;\lsdpriority39 \lsdlocked0 toc 4;\lsdpriority39 \lsdlocked0 toc 5;\lsdpriority39 \lsdlocked0 toc 6;
@ -7849,8 +7853,8 @@ c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100828abc
 \lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 6;
 \lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;
 \lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;
-\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdpriority37 \lsdlocked0 Bibliography;}}{\*\datastore 010500000200000018000000
+\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdpriority37 \lsdlocked0 Bibliography;
-4d73786d6c322e534158584d4c5265616465722e352e3000000000000000000000060000
+\lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;}}{\*\datastore 0105000002000000180000004d73786d6c322e534158584d4c5265616465722e352e3000000000000000000000060000
 d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
@ -7859,8 +7863,8 @@ fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffff
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffffec69d9888b8b3d4c859eaf6cd158be0f00000000000000000000000020d3
+ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffffec69d9888b8b3d4c859eaf6cd158be0f0000000000000000000000004097
-32292d60c701feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
+291d83b8c701feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000105000000000000}}
--- a/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/CompilerParametersPanel.cs
+++ b/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/CompilerParametersPanel.cs
@ -44,10 +44,10 @@ namespace ICSharpCode.WixBinding
 			WixCompilerExtensionPicker extensionPicker = new WixCompilerExtensionPicker();
 			extensionPicker.Dock = DockStyle.Fill;
 			ControlDictionary["compilerExtensionsGroupBox"].Controls.Add(extensionPicker);
 			extensionPicker.ExtensionsChanged += CompilerExtensionsChanged;
 			b = new WixCompilerExtensionBinding(extensionPicker);
 			helper.AddBinding("CompileExtension", b);
 			extensionPicker.ExtensionsChanged += CompilerExtensionsChanged;
 			InitWarnings();
--- a/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/LibraryParametersPanel.cs
+++ b/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/LibraryParametersPanel.cs
@ -23,10 +23,10 @@ namespace ICSharpCode.WixBinding
 			WixCompilerExtensionPicker extensionPicker = new WixCompilerExtensionPicker();
 			extensionPicker.Dock = DockStyle.Fill;
 			ControlDictionary["compilerExtensionsGroupBox"].Controls.Add(extensionPicker);
 			extensionPicker.ExtensionsChanged += CompilerExtensionsChanged;
 			WixCompilerExtensionBinding b = new WixCompilerExtensionBinding(extensionPicker);
 			helper.AddBinding("LibExtension", b);
 			extensionPicker.ExtensionsChanged += CompilerExtensionsChanged;
 			helper.AddConfigurationSelector(this);
 		}
--- a/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/LinkerParametersPanel.cs
+++ b/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/LinkerParametersPanel.cs
@ -23,10 +23,10 @@ namespace ICSharpCode.WixBinding
 			WixCompilerExtensionPicker extensionPicker = new WixCompilerExtensionPicker();
 			extensionPicker.Dock = DockStyle.Fill;
 			ControlDictionary["compilerExtensionsGroupBox"].Controls.Add(extensionPicker);
 			extensionPicker.ExtensionsChanged += CompilerExtensionsChanged;
 			WixCompilerExtensionBinding b = new WixCompilerExtensionBinding(extensionPicker);
 			helper.AddBinding("LinkExtension", b);
 			extensionPicker.ExtensionsChanged += CompilerExtensionsChanged;
 			helper.AddConfigurationSelector(this);
 		}
--- a/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/WixCompilerExtensionBinding.cs
+++ b/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/WixCompilerExtensionBinding.cs
@ -7,6 +7,7 @@
 using System;
 using System.Collections.ObjectModel;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Project;
 namespace ICSharpCode.WixBinding
@ -33,7 +34,12 @@ namespace ICSharpCode.WixBinding
 			IProject project = Project;
 			WixCompilerExtensionName[] extensions = extensionPicker.GetExtensions();
 			foreach (WixCompilerExtensionName extension in extensions) {
-				ProjectService.AddProjectItem(project, CreateProjectItem(extension));
+				if (extension.AssemblyName.Length > 0) {
 					ProjectService.AddProjectItem(project, CreateProjectItem(extension));
 				} else {
 					MessageService.ShowMessage(StringParser.Parse("${res:ICSharpCode.WixBinding.ExtensionBinding.InvalidExtension}"));
 					return false;
 				}
 			}
 			return true;
 		}
--- a/src/AddIns/BackendBindings/WixBinding/Project/Templates/WixUIFeatureTreeProject.xpt
+++ b/src/AddIns/BackendBindings/WixBinding/Project/Templates/WixUIFeatureTreeProject.xpt
@ -0,0 +1,84 @@
 <?xml version="1.0"?>
 <Template originators="Matt Ward">
 	<TemplateConfiguration>
 		<Name>${res:Templates.Project.SetupProject.Name} - WixUI Feature Tree</Name>
 		<Category>${res:Templates.File.Categories.Setup}</Category>
 		<Icon>Icons.32x32.EmptyProjectIcon</Icon>
 		<Description>${res:Templates.Project.SetupProject.Description}</Description>
 	</TemplateConfiguration>
 	<!-- Actions -->
 	<Actions>
 		<Open filename="Setup.wxs"/>
 	</Actions>
 	<!-- Template Content -->
 	<Project language="Wix">
 		<PropertyGroup escapeValue="false">
 			<LocalizedStringFile>$(WixToolPath)\WixUI_en-us.wxl</LocalizedStringFile>
 		</PropertyGroup>
 		<ProjectItems>
 			<WixLibrary Include="$(WixToolPath)\wixui.wixlib"/>
 		</ProjectItems>
 		<Files>
 			<File name="Setup.wxs"><![CDATA[<?xml version="1.0"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
 	<Product Id="${GUID}"
 		Name="Your Application"
 		Language="1033"
 		Version="1.0.0.0"
 		UpgradeCode="${GUID}"
 		Manufacturer="Your Company">
 		<Package Id="${GUID}"
 			Description="#Description"
 			Comments="Comments"
 			InstallerVersion="200"
 			Compressed="yes"/>
 		<!--
 			Source media for the installation. 
 			Specifies a single cab file to be embedded in the installer's .msi. 
 		-->
 		<Media Id="1" Cabinet="contents.cab" EmbedCab="yes" CompressionLevel="high"/>
 		<!-- Installation directory and files are defined in Files.wxs -->
 		<Directory Id="TARGETDIR" Name="SourceDir"/>
 		<Feature Id="Complete"
 		         Title="Your Application"
 		         Description="Your description"
 		         Level="1"
 		         ConfigurableDirectory="INSTALLDIR">
 		         <ComponentRef Id="MyComponent"/>
 		</Feature>
 		<!-- 
 			Using the Wix UI library
 			With the the WixUI_FeatureTree dialog set the user goes 
 			directly from the license agreement dialog to the feature 
 			customization dialog. This dialog set is useful
 			when your product installs all features by default. 
 		-->
 		<UIRef Id="WixUI_FeatureTree"/>
 	</Product>
 </Wix>
 ]]></File>
 			<File name="Files.wxs"><![CDATA[<?xml version="1.0"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
 	<Fragment>
 		<DirectoryRef Id="TARGETDIR">
 			<Directory Id="ProgramFilesFolder" Name="PFiles">
 				<Directory Id="INSTALLDIR" Name="YourApp" LongName="Your Application">
 					<Component Id="MyComponent" Guid="${GUID}" DiskId="1">
 						<File Id="LicenseFile" Name="license.rtf" Source="license.rtf"/>
 					</Component>
 				</Directory>
 			</Directory>
 		</DirectoryRef>
 	</Fragment>
 </Wix>
 ]]></File>
 			<File name="license.rtf" src="DefaultLicense.rtf" buildAction="None" />		
 		</Files>
 	</Project>
 </Template>
--- a/src/AddIns/BackendBindings/WixBinding/Project/Templates/WixUIInstallDirProject.xpt
+++ b/src/AddIns/BackendBindings/WixBinding/Project/Templates/WixUIInstallDirProject.xpt
@ -0,0 +1,83 @@
 <?xml version="1.0"?>
 <Template originators="Matt Ward">
 	<TemplateConfiguration>
 		<Name>${res:Templates.Project.SetupProject.Name} - WixUI Install Dir</Name>
 		<Category>${res:Templates.File.Categories.Setup}</Category>
 		<Icon>Icons.32x32.EmptyProjectIcon</Icon>
 		<Description>${res:Templates.Project.SetupProject.Description}</Description>
 	</TemplateConfiguration>
 	<!-- Actions -->
 	<Actions>
 		<Open filename="Setup.wxs"/>
 	</Actions>
 	<!-- Template Content -->
 	<Project language="Wix">
 		<PropertyGroup escapeValue="false">
 			<LocalizedStringFile>$(WixToolPath)\WixUI_en-us.wxl</LocalizedStringFile>
 		</PropertyGroup>
 		<ProjectItems>
 			<WixLibrary Include="$(WixToolPath)\wixui.wixlib"/>
 		</ProjectItems>
 		<Files>
 			<File name="Setup.wxs"><![CDATA[<?xml version="1.0"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
 	<Product Id="${GUID}"
 		Name="Your Application"
 		Language="1033"
 		Version="1.0.0.0"
 		UpgradeCode="${GUID}"
 		Manufacturer="Your Company">
 		<Package Id="${GUID}"
 			Description="#Description"
 			Comments="Comments"
 			InstallerVersion="200"
 			Compressed="yes"/>
 		<!--
 			Source media for the installation. 
 			Specifies a single cab file to be embedded in the installer's .msi. 
 		-->
 		<Media Id="1" Cabinet="contents.cab" EmbedCab="yes" CompressionLevel="high"/>
 		<!-- Installation directory and files are defined in Files.wxs -->
 		<Directory Id="TARGETDIR" Name="SourceDir"/>
 		<Feature Id="Complete"
 		         Title="Your Application"
 		         Description="Your description"
 		         Level="1">
 		         <ComponentRef Id="MyComponent"/>
 		</Feature>
 		<!-- 
 			Using the Wix UI library
 			WixUI_InstallDir does not allow the user to choose 
 			features but adds a dialog to let the user choose a 
 			directory where the product will be installed
 		-->
 		<Property Id="WIXUI_INSTALLDIR">INSTALLDIR</Property>
 		<UIRef Id="WixUI_InstallDir"/>
 	</Product>
 </Wix>
 ]]></File>
 			<File name="Files.wxs"><![CDATA[<?xml version="1.0"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
 	<Fragment>
 		<DirectoryRef Id="TARGETDIR">
 			<Directory Id="ProgramFilesFolder" Name="PFiles">
 				<Directory Id="INSTALLDIR" Name="YourApp" LongName="Your Application">
 					<Component Id="MyComponent" Guid="${GUID}" DiskId="1">
 						<File Id="LicenseFile" Name="license.rtf" Source="license.rtf"/>
 					</Component>
 				</Directory>
 			</Directory>
 		</DirectoryRef>
 	</Fragment>
 </Wix>
 ]]></File>
 			<File name="license.rtf" src="DefaultLicense.rtf" buildAction="None" />		
 		</Files>
 	</Project>
 </Template>
--- a/src/AddIns/BackendBindings/WixBinding/Project/Templates/WixUIMinimalProject.xpt
+++ b/src/AddIns/BackendBindings/WixBinding/Project/Templates/WixUIMinimalProject.xpt
@ -0,0 +1,84 @@
 <?xml version="1.0"?>
 <Template originators="Matt Ward">
 	<TemplateConfiguration>
 		<Name>${res:Templates.Project.SetupProject.Name} - WixUI Minimal</Name>
 		<Category>${res:Templates.File.Categories.Setup}</Category>
 		<Icon>Icons.32x32.EmptyProjectIcon</Icon>
 		<Description>${res:Templates.Project.SetupProject.Description}</Description>
 	</TemplateConfiguration>
 	<!-- Actions -->
 	<Actions>
 		<Open filename="Setup.wxs"/>
 	</Actions>
 	<!-- Template Content -->
 	<Project language="Wix">
 		<PropertyGroup escapeValue="false">
 			<LocalizedStringFile>$(WixToolPath)\WixUI_en-us.wxl</LocalizedStringFile>
 		</PropertyGroup>
 		<ProjectItems>
 			<WixLibrary Include="$(WixToolPath)\wixui.wixlib"/>
 		</ProjectItems>
 		<Files>
 			<File name="Setup.wxs"><![CDATA[<?xml version="1.0"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
 	<Product Id="${GUID}"
 		Name="Your Application"
 		Language="1033"
 		Version="1.0.0.0"
 		UpgradeCode="${GUID}"
 		Manufacturer="Your Company">
 		<Package Id="${GUID}"
 			Description="#Description"
 			Comments="Comments"
 			InstallerVersion="200"
 			Compressed="yes"/>
 		<!--
 			Source media for the installation. 
 			Specifies a single cab file to be embedded in the installer's .msi. 
 		-->
 		<Media Id="1" Cabinet="contents.cab" EmbedCab="yes" CompressionLevel="high"/>
 		<!-- Installation directory and files are defined in Files.wxs -->
 		<Directory Id="TARGETDIR" Name="SourceDir"/>
 		<Feature Id="Complete"
 		         Title="Your Application"
 		         Description="Your description"
 		         Level="1">
 		         <ComponentRef Id="MyComponent"/>
 		</Feature>
 		<!--
 			Using the Wix UI library.
 			WixUI_Minimal is the most basic of the WixUI stock dialog sets.
 			Its sole dialog combines the welcome and license-agreement 
 			dialogs and omits the feature customization dialog. 
 			WixUI_Minimal is appropriate when your product has no optional 
 			features.
 		-->
 		<UIRef Id="WixUI_Minimal"/>
 	</Product>
 </Wix>
 ]]></File>
 			<File name="Files.wxs"><![CDATA[<?xml version="1.0"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
 	<Fragment>
 		<DirectoryRef Id="TARGETDIR">
 			<Directory Id="ProgramFilesFolder" Name="PFiles">
 				<Directory Id="INSTALLDIR" Name="YourApp" LongName="Your Application">
 					<Component Id="MyComponent" Guid="${GUID}" DiskId="1">
 						<File Id="LicenseFile" Name="license.rtf" Source="license.rtf"/>
 					</Component>
 				</Directory>
 			</Directory>
 		</DirectoryRef>
 	</Fragment>
 </Wix>
 ]]></File>
 			<File name="license.rtf" src="DefaultLicense.rtf" buildAction="None" />		
 		</Files>
 	</Project>
 </Template>
--- a/src/AddIns/BackendBindings/WixBinding/Project/Templates/WixUIMondoProject.xpt
+++ b/src/AddIns/BackendBindings/WixBinding/Project/Templates/WixUIMondoProject.xpt
@ -0,0 +1,94 @@
 <?xml version="1.0"?>
 <Template originators="Matt Ward">
 	<TemplateConfiguration>
 		<Name>${res:Templates.Project.SetupProject.Name} - WixUI Mondo</Name>
 		<Category>${res:Templates.File.Categories.Setup}</Category>
 		<Icon>Icons.32x32.EmptyProjectIcon</Icon>
 		<Description>${res:Templates.Project.SetupProject.Description}</Description>
 	</TemplateConfiguration>
 	<!-- Actions -->
 	<Actions>
 		<Open filename="Setup.wxs"/>
 	</Actions>
 	<!-- Template Content -->
 	<Project language="Wix">
 		<PropertyGroup escapeValue="false">
 			<LocalizedStringFile>$(WixToolPath)\WixUI_en-us.wxl</LocalizedStringFile>
 		</PropertyGroup>
 		<ProjectItems>
 			<WixLibrary Include="$(WixToolPath)\wixui.wixlib"/>
 		</ProjectItems>
 		<Files>
 			<File name="Setup.wxs"><![CDATA[<?xml version="1.0"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
 	<Product Id="${GUID}"
 		Name="Your Application"
 		Language="1033"
 		Version="1.0.0.0"
 		UpgradeCode="${GUID}"
 		Manufacturer="Your Company">
 		<Package Id="${GUID}"
 			Description="#Description"
 			Comments="Comments"
 			InstallerVersion="200"
 			Compressed="yes"/>
 		<!--
 			Source media for the installation. 
 			Specifies a single cab file to be embedded in the installer's .msi. 
 		-->
 		<Media Id="1" Cabinet="contents.cab" EmbedCab="yes" CompressionLevel="high"/>
 		<!-- Installation directory and files are defined in Files.wxs -->
 		<Directory Id="TARGETDIR" Name="SourceDir"/>
 		<Feature Id="Complete"
 		         Title="Your Application"
 		         Description="Your description"
 		         Level="1"
 		         ConfigurableDirectory="INSTALLDIR">
 		         <ComponentRef Id="MyComponent"/>
 		</Feature>
 		<!-- 
 			Using the Wix UI library
 			WixUI_Mondo includes the full set of dialogs:
 			welcome
 			license agreement
 			setup type (typical, custom, and complete)
 			feature customization
 			directory browse
 			disk cost. 
 			Maintenance-mode dialogs are also included. 
 			Use WixUI_Mondo when you have some of your product's features 
 			are not installed by default and there is a meaningful 
 			difference between typical and complete installs
 		-->
 		<UIRef Id="WixUI_Mondo"/>
 	</Product>
 </Wix>
 ]]></File>
 			<File name="Files.wxs"><![CDATA[<?xml version="1.0"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
 	<Fragment>
 		<DirectoryRef Id="TARGETDIR">
 			<Directory Id="ProgramFilesFolder" Name="PFiles">
 				<Directory Id="INSTALLDIR" Name="YourApp" LongName="Your Application">
 					<Component Id="MyComponent" Guid="${GUID}" DiskId="1">
 						<File Id="LicenseFile" Name="license.rtf" Source="license.rtf"/>
 					</Component>
 				</Directory>
 			</Directory>
 		</DirectoryRef>
 	</Fragment>
 </Wix>
 ]]></File>
 			<File name="license.rtf" src="DefaultLicense.rtf" buildAction="None" />		
 		</Files>
 	</Project>
 </Template>
--- a/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj
+++ b/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.csproj
@ -192,6 +192,18 @@
    <Content Include="Templates\DefaultLicense.rtf">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <None Include="Templates\WixUIFeatureTreeProject.xpt">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
    <None Include="Templates\WixUIInstallDirProject.xpt">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
    <None Include="Templates\WixUIMinimalProject.xpt">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
    <None Include="Templates\WixUIMondoProject.xpt">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
  </ItemGroup>
  <ItemGroup>
    <Content Include="WixBinding.addin">
--- a/src/AddIns/Misc/UnitTesting/Src/BaseTestMethod.cs
+++ b/src/AddIns/Misc/UnitTesting/Src/BaseTestMethod.cs
@ -0,0 +1,46 @@
 // <file>
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
 //     <version>$Revision$</version>
 // </file>
 using System;
 using ICSharpCode.SharpDevelop.Dom;
 namespace ICSharpCode.UnitTesting
 {
 	/// <summary>
 	/// Represents a test method that exists in a base class.
 	/// </summary>
 	/// <remarks>
 	/// In order to have the Unit Test tree run the correct
 	/// test when we have a class that has a base class with 
 	/// test methods is to return the derived class from the
 	/// DeclaringType's property. Otherwise the base class
 	/// method is tested and the derived class is not used.
 	/// </remarks>
 	public class BaseTestMethod : DefaultMethod
 	{
 		IMethod method;
 		/// <summary>
 		/// Creates a new instance of the BaseTestMethod.
 		/// </summary>
 		/// <param name="derivedClass">The derived class and not
 		/// the class where the method is actually defined.</param>
 		/// <param name="method">The base class's test method.</param>
 		public BaseTestMethod(IClass derivedClass, IMethod method)
 			: base(method.Name, method.ReturnType, method.Modifiers, method.Region, method.BodyRegion, derivedClass)
 		{
 			this.method = method;
 		}
 		/// <summary>
 		/// Gets the actual method used to create this object.
 		/// </summary>
 		public IMethod Method {
 			get { return method; }
 		}
 	}
 }
--- a/src/AddIns/Misc/UnitTesting/Src/TestClass.cs
+++ b/src/AddIns/Misc/UnitTesting/Src/TestClass.cs
@ -328,7 +328,8 @@ namespace ICSharpCode.UnitTesting
 			if (c.BaseClass != null) {
 				foreach (IMethod method in c.BaseClass.Methods) {
 					if (TestMethod.IsTestMethod(method)) {
-						TestMethod testMethod = new TestMethod(c.BaseClass.Name, method);
+						BaseTestMethod baseTestMethod = new BaseTestMethod(c, method);
 						TestMethod testMethod = new TestMethod(c.BaseClass.Name, baseTestMethod);
 						if (!testMethods.Contains(testMethod.Name)) {
 							testMethods.Add(testMethod);
 						}
--- a/src/AddIns/Misc/UnitTesting/Src/UnitTestCommands.cs
+++ b/src/AddIns/Misc/UnitTesting/Src/UnitTestCommands.cs
@ -45,6 +45,10 @@ namespace ICSharpCode.UnitTesting
 				IMember member = treeView.SelectedMethod;
 				IClass c = treeView.SelectedClass;
 				if (member != null) {
 					BaseTestMethod baseTestMethod = member as BaseTestMethod;
 					if (baseTestMethod != null) {
 						member = baseTestMethod.Method;
 					}
 					GotoMember(member);
 				} else if (c != null) {
 					GotoClass(c);
--- a/src/AddIns/Misc/UnitTesting/Test/Project/BaseTestMethodTestFixture.cs
+++ b/src/AddIns/Misc/UnitTesting/Test/Project/BaseTestMethodTestFixture.cs
@ -0,0 +1,91 @@
 // <file>
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
 //     <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
 //     <version>$Revision$</version>
 // </file>
 using System;
 using ICSharpCode.SharpDevelop.Dom;
 using ICSharpCode.UnitTesting;
 using NUnit.Framework;
 using UnitTesting.Tests.Utils;
 namespace UnitTesting.Tests.Project
 {
 	/// <summary>
 	/// Tests that the BaseTestMethod populates the various
 	/// properties of the DefaultMethod class in its constructor.
 	/// </summary>
 	[TestFixture]
 	public class BaseTestMethodTestFixture
 	{
 		MockClass mockClass;
 		MockMethod mockMethod;
 		BaseTestMethod baseTestMethod;
 		DomRegion mockMethodRegion;
 		DomRegion mockMethodBodyRegion;
 		DefaultReturnType returnType;
 		[TestFixtureSetUp]
 		public void SetUpFixture()
 		{
 			mockClass = new MockClass("Tests.MyTestFixture");
 			mockMethod = new MockMethod("MyMethod");
 			mockMethodRegion = new DomRegion(0, 0, 0, 10);
 			mockMethod.Region = mockMethodRegion;
 			mockMethodBodyRegion = new DomRegion(1, 0, 2, 5);
 			mockMethod.BodyRegion = mockMethodBodyRegion;
 			mockMethod.Modifiers = ModifierEnum.Public;
 			MockClass returnTypeClass = new MockClass("Tests.ReturnType");
 			returnType = new DefaultReturnType(returnTypeClass);
 			mockMethod.ReturnType = returnType;
 			baseTestMethod = new BaseTestMethod(mockClass, mockMethod);
 		}
 		[Test]
 		public void MethodName()
 		{
 			Assert.AreEqual("MyMethod", baseTestMethod.Name);
 		}
 		[Test]
 		public void DeclaringType()
 		{
 			Assert.AreEqual(mockClass, baseTestMethod.DeclaringType);
 		}
 		[Test]
 		public void ActualMethod()
 		{
 			Assert.AreEqual(mockMethod, baseTestMethod.Method);
 		}
 		[Test]
 		public void MethodRegion()
 		{
 			Assert.AreEqual(mockMethodRegion, baseTestMethod.Region);
 		}
 		[Test]
 		public void MethodBodyRegion()
 		{
 			Assert.AreEqual(mockMethodBodyRegion, baseTestMethod.BodyRegion);
 		}
 		[Test]
 		public void Modifiers()
 		{
 			Assert.AreEqual(ModifierEnum.Public, baseTestMethod.Modifiers);
 		}
 		[Test]
 		public void ReturnType()
 		{
 			Assert.IsTrue(Object.ReferenceEquals(returnType, baseTestMethod.ReturnType));
 		}
 	}
 }
--- a/src/AddIns/Misc/UnitTesting/Test/Project/TestMethodsInBaseClassTestFixture.cs
+++ b/src/AddIns/Misc/UnitTesting/Test/Project/TestMethodsInBaseClassTestFixture.cs
@ -38,6 +38,7 @@ namespace UnitTesting.Tests.Project
 	public class TestMethodsInBaseClassTestFixture
 	{
 		TestClass testClass;
 		MockClass c;
 		[SetUp]
 		public void SetUp()
@ -55,7 +56,7 @@ namespace UnitTesting.Tests.Project
 			baseClass.Methods.Add(baseMethod);
 			// Create the derived test class.
-			MockClass c = new MockClass("RootNamespace.MyTestFixture");
+			c = new MockClass("RootNamespace.MyTestFixture");
 			c.Attributes.Add(new MockAttribute("TestFixture"));
 			c.ProjectContent = projectContent;
 			MockMethod method = new MockMethod("DerivedMethod");
@ -89,6 +90,19 @@ namespace UnitTesting.Tests.Project
 			Assert.IsTrue(testClass.TestMethods.Contains("TestFixtureBase.BaseMethod"));
 		}
 		/// <summary>
 		/// The TestMethod.Method property should return an IMethod 
 		/// that returns the derived class from the DeclaringType property
 		/// and not the base class. This ensures that the correct
 		/// test is run when selected in the unit test tree.
 		/// </summary>
 		[Test]
 		public void BaseMethodDeclaringTypeIsDerivedClass()
 		{
 			TestMethod method = testClass.TestMethods["TestFixtureBase.BaseMethod"];
 			Assert.AreEqual(c, method.Method.DeclaringType);
 		}
 		[Test]
 		public void UpdateTestResultUsingPrefixBaseClassName()
 		{
--- a/src/AddIns/Misc/UnitTesting/Test/UnitTesting.Tests.csproj
+++ b/src/AddIns/Misc/UnitTesting/Test/UnitTesting.Tests.csproj
@ -60,6 +60,7 @@
  <ItemGroup>
    <Compile Include="AssemblyInfo.cs" />
    <Compile Include="NamespaceFilterTests.cs" />
    <Compile Include="Project\BaseTestMethodTestFixture.cs" />
    <Compile Include="TestableConditionTests.cs" />
    <Compile Include="Tree\MultipleTestProjectsTestFixture.cs" />
    <Compile Include="Tree\TreeNodeContextMenuTestFixture.cs" />
--- a/src/AddIns/Misc/UnitTesting/Test/Utils/MockMethod.cs
+++ b/src/AddIns/Misc/UnitTesting/Test/Utils/MockMethod.cs
@ -14,10 +14,13 @@ namespace UnitTesting.Tests.Utils
 	public class MockMethod : IMethod
 	{
 		IClass declaringType;
 		ModifierEnum modifiers;
 		DomRegion region = DomRegion.Empty;
 		DomRegion bodyRegion = DomRegion.Empty;
 		IList<IAttribute> attributes = new List<IAttribute>();
 		string name = String.Empty;
 		IList<IParameter> parameters = new List<IParameter>();
 		IReturnType returnType;
 		public MockMethod() : this(String.Empty)
 		{
@ -42,7 +45,10 @@ namespace UnitTesting.Tests.Utils
 		public DomRegion BodyRegion {
 			get {
-				throw new NotImplementedException();
+				return bodyRegion;
 			}
 			set {
 				bodyRegion = value;
 			}
 		}
@ -96,10 +102,10 @@ namespace UnitTesting.Tests.Utils
 		public IReturnType ReturnType {
 			get {
-				return null;
+				return returnType;
 			}
 			set {
-				throw new NotImplementedException();
+				returnType = value;
 			}
 		}
@ -114,9 +120,10 @@ namespace UnitTesting.Tests.Utils
 		public ModifierEnum Modifiers {
 			get {
-				return ModifierEnum.None;
+				return modifiers;
 			}
 			set {
 				modifiers = value;
 			}
 		}
--- a/src/AddIns/Misc/UnitTesting/UnitTesting.csproj
+++ b/src/AddIns/Misc/UnitTesting/UnitTesting.csproj
@ -59,6 +59,7 @@
      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
    </None>
    <Compile Include="Src\AllTestsTreeNode.cs" />
    <Compile Include="Src\BaseTestMethod.cs" />
    <Compile Include="Src\UnitTestCommands.cs" />
    <Compile Include="Src\TestableCondition.cs" />
    <Compile Include="Src\RunningTestsCondition.cs" />
--- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs
+++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs
--- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG
+++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG
@ -2421,8 +2421,6 @@ EmbeddedStatement<out Statement statement>
 	| /* 10.8.1 */
 	"If" (. Location ifStartLocation = t.Location; .) Expr<out expr> [ "Then" ] 
 	(	
 		IF (IsEndStmtAhead()) "End" (. statement = new IfElseStatement(expr, new EndStatement()); statement.StartLocation = ifStartLocation; statement.EndLocation = t.Location; .) 
 		|
 		/* multiline if statement */
 		EndOfStmt Block<out embeddedStatement>
 		(.
@ -2457,24 +2455,17 @@ EmbeddedStatement<out Statement statement>
 			ifStatement.EndLocation = t.Location;
 			statement = ifStatement;
 		.)
-		| /* singleline if statement */
+	|	/* singleline if statement */
 		EmbeddedStatement<out embeddedStatement>
 		(.
-			IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement);
+			IfElseStatement ifStatement = new IfElseStatement(expr);
 			ifStatement.StartLocation = ifStartLocation;
 		.)
-		{ ":" EmbeddedStatement<out embeddedStatement> (. ifStatement.TrueStatement.Add(embeddedStatement); .) }
+		SingleLineStatementList<ifStatement.TrueStatement>
 		[
-			"Else" [ EmbeddedStatement<out embeddedStatement> ]
+			"Else"
-			(.
+			[ SingleLineStatementList<ifStatement.FalseStatement> ]
 				ifStatement.FalseStatement.Add(embeddedStatement);
 			.)
 			{
 				":" EmbeddedStatement<out embeddedStatement>
 				(. ifStatement.FalseStatement.Add(embeddedStatement); .)
 			}
 		]
-		(. ifStatement.EndLocation = ifStartLocation; statement = ifStatement; .)
+		(. ifStatement.EndLocation = t.Location; statement = ifStatement; .)
 	)
 	| /* 10.8.2 */
 	"Select" [ "Case" ] Expr<out expr> EndOfStmt
@ -2542,6 +2533,19 @@ EmbeddedStatement<out Statement statement>
 		"End" "Using"
 .
 SingleLineStatementList<List<Statement> list>
 (. Statement embeddedStatement = null; .)
 =
 	( "End" (. embeddedStatement = new EndStatement(); .)
 	| EmbeddedStatement<out embeddedStatement> )
 	(. if (embeddedStatement != null) list.Add(embeddedStatement); .)
 	{	":" { ":" }
 		( "End" (. embeddedStatement = new EndStatement(); .)
 		| EmbeddedStatement<out embeddedStatement> )
 		(. if (embeddedStatement != null) list.Add(embeddedStatement); .)
 	}
 .
 /* 10.9.2 */
 LoopControlVariable<out TypeReference type, out string name>
 (.ArrayList arrayModifiers = null;
--- a/src/Libraries/NRefactory/Test/Parser/Statements/IfElseStatementTests.cs
+++ b/src/Libraries/NRefactory/Test/Parser/Statements/IfElseStatementTests.cs
@ -130,6 +130,47 @@ namespace ICSharpCode.NRefactory.Tests.Ast
 			Assert.IsTrue(ifElseStatement.TrueStatement[0] is BlockStatement, "Statement was: " + ifElseStatement.TrueStatement[0]);
 			Assert.IsTrue(ifElseStatement.ElseIfSections[0].EmbeddedStatement.Children[0] is StopStatement, "Statement was: " + ifElseStatement.ElseIfSections[0].EmbeddedStatement.Children[0]);
 		}
 		[Test]
 		public void VBNetMultiStatementIfStatementTest()
 		{
 			IfElseStatement ifElseStatement = ParseUtilVBNet.ParseStatement<IfElseStatement>("If True THEN Stop : b");
 			Assert.IsFalse(ifElseStatement.Condition.IsNull);
 			Assert.AreEqual(2, ifElseStatement.TrueStatement.Count, "true count");
 			Assert.AreEqual(0, ifElseStatement.FalseStatement.Count, "false count");
 			Assert.IsTrue(ifElseStatement.TrueStatement[0] is StopStatement);
 			Assert.IsTrue(ifElseStatement.TrueStatement[1] is ExpressionStatement);
 		}
 		[Test]
 		public void VBNetMultiStatementIfStatementWithEndStatementTest()
 		{
 			IfElseStatement ifElseStatement = ParseUtilVBNet.ParseStatement<IfElseStatement>("If True THEN Stop : End : b");
 			Assert.IsFalse(ifElseStatement.Condition.IsNull);
 			Assert.AreEqual(3, ifElseStatement.TrueStatement.Count, "true count");
 			Assert.AreEqual(0, ifElseStatement.FalseStatement.Count, "false count");
 			Assert.IsTrue(ifElseStatement.TrueStatement[0] is StopStatement);
 			Assert.IsTrue(ifElseStatement.TrueStatement[1] is EndStatement);
 			Assert.IsTrue(ifElseStatement.TrueStatement[2] is ExpressionStatement);
 		}
 		[Test]
 		public void VBNetIfWithEmptyElseTest()
 		{
 			IfElseStatement ifElseStatement = ParseUtilVBNet.ParseStatement<IfElseStatement>("If True THEN a Else");
 			Assert.IsFalse(ifElseStatement.Condition.IsNull);
 			Assert.AreEqual(1, ifElseStatement.TrueStatement.Count, "true count");
 			Assert.AreEqual(0, ifElseStatement.FalseStatement.Count, "false count");
 		}
 		[Test]
 		public void VBNetIfWithMultipleColons()
 		{
 			IfElseStatement ifElseStatement = ParseUtilVBNet.ParseStatement<IfElseStatement>("If True THEN a : : b");
 			Assert.IsFalse(ifElseStatement.Condition.IsNull);
 			Assert.AreEqual(2, ifElseStatement.TrueStatement.Count, "true count");
 			Assert.AreEqual(0, ifElseStatement.FalseStatement.Count, "false count");
 		}
 		#endregion
 	}
 }
--- a/src/Main/Base/Project/Src/Internal/Templates/Project/ProjectDescriptor.cs
+++ b/src/Main/Base/Project/Src/Internal/Templates/Project/ProjectDescriptor.cs
@ -142,10 +142,12 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates
 		void LoadProjectItems(XmlElement projectItemsElement)
 		{
 			bool escapeIncludeValue = String.Equals(projectItemsElement.GetAttribute("escapeValue"), "false", StringComparison.OrdinalIgnoreCase);
 			foreach (XmlElement projectItemElement in ChildElements(projectItemsElement)) {
 				ProjectItem item = new UnknownProjectItem(null,
 				                                          projectItemElement.Name,
-				                                          projectItemElement.GetAttribute("Include"));
+				                                          projectItemElement.GetAttribute("Include"),
 				                                          escapeIncludeValue);
 				foreach (XmlElement metadataElement in ChildElements(projectItemElement)) {
 					item.SetMetadata(metadataElement.Name, metadataElement.InnerText);
 				}
--- a/src/Main/Base/Project/Src/Project/CompilableProject.cs
+++ b/src/Main/Base/Project/Src/Project/CompilableProject.cs
@ -91,6 +91,11 @@ namespace ICSharpCode.SharpDevelop.Project
 			            PropertyStorageLocations.ConfigurationSpecific, true);
 			SetProperty("Release", null, "DebugType", "None",
 			            PropertyStorageLocations.ConfigurationSpecific, true);
 			SetProperty("Debug", null, "Optimize", "False",
 			            PropertyStorageLocations.ConfigurationSpecific, true);
 			SetProperty("Release", null, "Optimize", "True",
 			            PropertyStorageLocations.ConfigurationSpecific, true);
 		}
 		/// <summary>
--- a/src/Main/Base/Project/Src/Project/Items/ProjectItem.cs
+++ b/src/Main/Base/Project/Src/Project/Items/ProjectItem.cs
@ -31,6 +31,7 @@ namespace ICSharpCode.SharpDevelop.Project
 	{
 		IProject project;
 		volatile string fileNameCache;
 		bool treatIncludeAsLiteral;
 		// either use: (bound mode)
 		BuildItem buildItem;
@ -46,6 +47,7 @@ namespace ICSharpCode.SharpDevelop.Project
 				throw new ArgumentNullException("project");
 			this.project = project;
 			this.buildItem = buildItem;
 			this.treatIncludeAsLiteral = true;
 		}
 		protected ProjectItem(IProject project, ItemType itemType)
@ -54,11 +56,17 @@ namespace ICSharpCode.SharpDevelop.Project
 		}
 		protected ProjectItem(IProject project, ItemType itemType, string include)
 			: this(project, itemType, include, true)
 		{
 		}
 		protected ProjectItem(IProject project, ItemType itemType, string include, bool treatIncludeAsLiteral)
 		{
 			this.project = project;
 			this.virtualItemType = itemType;
 			this.virtualInclude = include ?? "";
 			this.virtualMetadata = new Dictionary<string, string>();
 			this.treatIncludeAsLiteral = treatIncludeAsLiteral;
 		}
 		[Browsable(false)]
@ -68,6 +76,12 @@ namespace ICSharpCode.SharpDevelop.Project
 			}
 		}
 		[Browsable(false)]
 		public bool TreatIncludeAsLiteral {
 			get { return treatIncludeAsLiteral; }
 			set { treatIncludeAsLiteral = value; }
 		}
 		/// <summary>
 		/// Gets the object used for synchronization. This is project.SyncRoot for items inside a project; or
 		/// virtualMetadata for items without project.
--- a/src/Main/Base/Project/Src/Project/Items/UnknownProjectItem.cs
+++ b/src/Main/Base/Project/Src/Project/Items/UnknownProjectItem.cs
@ -23,7 +23,15 @@ namespace ICSharpCode.SharpDevelop.Project
 		/// Constructor for internal use in ProjectDescriptor.
 		/// </summary>
 		internal UnknownProjectItem(IProject project, string itemType, string include)
-			: base(project, new ItemType(itemType), include)
+			: this(project, itemType, include, false)
 		{
 		}
 		/// <summary>
 		/// Constructor for internal use in ProjectDescriptor.
 		/// </summary>
 		internal UnknownProjectItem(IProject project, string itemType, string include, bool treatIncludeAsLiteral)
 			: base(project, new ItemType(itemType), include, treatIncludeAsLiteral)
 		{
 		}		
 	}
--- a/src/Main/Base/Project/Src/Project/MSBuildInternals.cs
+++ b/src/Main/Base/Project/Src/Project/MSBuildInternals.cs
@ -75,7 +75,7 @@ namespace ICSharpCode.SharpDevelop.Project
 				throw new ArgumentNullException("item");
 			if (item.IsAddedToProject)
 				throw new ArgumentException("item is already added to project", "item");
-			MSBuild.BuildItem newItem = group.AddNewItem(item.ItemType.ToString(), item.Include, true);
+			MSBuild.BuildItem newItem = group.AddNewItem(item.ItemType.ToString(), item.Include, item.TreatIncludeAsLiteral);
 			foreach (string name in item.MetadataNames) {
 				newItem.SetMetadata(name, item.GetMetadata(name));
 			}
@ -122,6 +122,9 @@ namespace ICSharpCode.SharpDevelop.Project
 			try {
 				MSBuild.Engine engine = CreateEngine();
 				tempProject = engine.CreateNewProject();
 				// tell MSBuild the path so that projects containing <Import Project="relativePath" />
 				// can be loaded
 				tempProject.FullFileName = baseProject.FullFileName;
 				MSBuildBasedProject.InitializeMSBuildProject(tempProject);
 				tempProject.LoadXml(baseProject.Xml);
 				tempProject.SetProperty("Configuration", configuration);
--- a/src/Main/Base/Project/Src/TextEditor/Gui/Editor/QuickClassBrowserPanel.cs
+++ b/src/Main/Base/Project/Src/TextEditor/Gui/Editor/QuickClassBrowserPanel.cs
@ -160,7 +160,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
 			string ToStringInternal()
 			{
 				IAmbience ambience = AmbienceService.CurrentAmbience;
-				ambience.ConversionFlags = ConversionFlags.ShowParameterNames;
+				ambience.ConversionFlags = ConversionFlags.ShowParameterList | ConversionFlags.ShowParameterNames;
 				if (item is IMethod) {
 					return ambience.Convert((IMethod)item);
 				}
--- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/ProjectContentRegistry.cs
+++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/ProjectContentRegistry.cs
@ -314,7 +314,7 @@ namespace ICSharpCode.SharpDevelop.Dom
 					// add default .NET assemblies to redirected assemblies (both when loaded from persistence
 					// and when loaded using Reflection)
 					lock (redirectedAssemblyNames) {
-						redirectedAssemblyNames.Add(shortName, pc.AssemblyFullName);
+						redirectedAssemblyNames[shortName] = pc.AssemblyFullName;
 					}
 				}
 			} else {
@ -404,3 +404,4 @@ namespace ICSharpCode.SharpDevelop.Dom
 		}
 	}
 }
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@ -306,7 +306,7 @@
 										<File Source="..\..\bin\Tools\Wix\Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll" Name="MICROS_1.DLL" Id="Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll" LongName="Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll" Assembly=".net" AssemblyApplication="Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll" AssemblyManifest="Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll" KeyPath="yes" />
 									</Component>
 									<Component Id="NetFxWixLib" Guid="CE847BC0-E9B2-41A1-A117-A9C0F22BD044" DiskId="1">
-										<File Source="..\..\bin\Tools\Wix\netfx.wixlib" Name="netfx.lib" LongName="netfix.wixlib" Id="netfx.wixlib" />
+										<File Source="..\..\bin\Tools\Wix\netfx.wixlib" Name="netfx.lib" Id="netfx.wixlib" />
 									</Component>
 									<Component Id="NetFxCaDll" Guid="F5970A44-7122-4660-ABCD-821360690CCC" DiskId="1">
 										<File Source="..\..\bin\Tools\Wix\netfxca.dll" Name="netfxca.dll" Id="netfxca.dll" />
@ -943,6 +943,18 @@
 												<File Source="..\..\AddIns\AddIns\BackendBindings\WixBinding\Templates\DefaultViewLicenseAgreementDialog.wxs" Name="LicDlg.wxs" Id="DefaultViewLicenseAgreementDialog.wxs" LongName="DefaultViewLicenseAgreementDialog.wxs" />
 												<File Source="..\..\AddIns\AddIns\BackendBindings\WixBinding\Templates\DefaultWelcomeDialog.wxs" Name="WelcmDlg.wxs" Id="DefaultWelcomeDialog.wxs" LongName="DefaultWelcomeDialog.wxs" />
 											</Component>
 											<Component Guid="C880DD6E-EFD9-436D-8CC3-B91A45BB53E1" DiskId="1" Id="WixUIFeatureTreeProjectTemplate">
 												<File Source="..\..\AddIns\AddIns\BackendBindings\WixBinding\Templates\WixUIFeatureTreeProject.xpt" Name="WUIFTREE.XPT" Id="WixUIFeatureTreeProject.xpt" LongName="WixUIFeatureTreeProject.xpt" KeyPath="yes" />
 											</Component>
 											<Component Guid="5F910AA8-EA41-46C7-9B8B-9DA6DAC835F0" Id="WixUIInstallDirProjectTemplate" DiskId="1">
 												<File Source="..\..\AddIns\AddIns\BackendBindings\WixBinding\Templates\WixUIInstallDirProject.xpt" Name="WUIDIR.XPT" Id="WixUIInstallDirProject.xpt" LongName="WixUIInstallDirProject.xpt" KeyPath="yes" />
 											</Component>
 											<Component Guid="36FF353F-2C22-42D1-9E2A-B2CE5FC2BA56" Id="WixUIMinimalProjectTemplate" DiskId="1">
 												<File Source="..\..\AddIns\AddIns\BackendBindings\WixBinding\Templates\WixUIMinimalProject.xpt" Name="WUIMIN.XPT" Id="WixUIMinimalProject.xpt" LongName="WixUIMinimalProject.xpt" KeyPath="yes" />
 											</Component>
 											<Component Guid="D930CB0E-1554-457C-A274-FF58D10D3659" Id="WixUIMondoProjectTemplate" DiskId="1">
 												<File Source="..\..\AddIns\AddIns\BackendBindings\WixBinding\Templates\WixUIMondoProject.xpt" Name="WUIMONDO.XPT" Id="WixUIMondoProject.xpt" LongName="WixUIMondoProject.xpt" KeyPath="yes" />
 											</Component>
 										</Directory>
 									</Directory>
 									<Directory Id="XamlBinding" Name="XamlBind" LongName="XamlBinding">
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@ -300,6 +300,10 @@
 				<ComponentRef Id="VBNetBindingFiles"/>
 				<ComponentRef Id="WixBindingFiles"/>
 				<ComponentRef Id="WixBindingTemplates"/>
 				<ComponentRef Id="WixUIMondoProjectTemplate"/>
 				<ComponentRef Id="WixUIMinimalProjectTemplate"/>
 				<ComponentRef Id="WixUIInstallDirProjectTemplate"/>
 				<ComponentRef Id="WixUIFeatureTreeProjectTemplate"/>
 				<ComponentRef Id="FormsDesignerFiles"/>
 				<ComponentRef Id="IconEditorAddInFiles"/>
 				<ComponentRef Id="IconEditorExe"/>