diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.csproj b/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.csproj
index 53108a37a1..cdeb9d3e33 100644
--- a/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.csproj
+++ b/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.csproj
@@ -16,8 +16,6 @@
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <OutputPath>..\..\..\..\..\..\AddIns\AddIns\BackendBindings\BooBinding\</OutputPath>
-    <PostBuildEvent>"$(MSBuildProjectDirectory)\PostBuildEvent.bat" "$(MSBuildProjectDirectory)"</PostBuildEvent>
-    <RunPostBuildEvent>OnSuccessfulBuild</RunPostBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <Optimize>False</Optimize>
@@ -138,6 +136,8 @@
     <Content Include="Templates\Form.xft">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="PostBuildEvent.proj" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+  <Import Project="PostBuildEvent.proj" />
 </Project>
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Project/PostBuildEvent.bat b/src/AddIns/BackendBindings/Boo/BooBinding/Project/PostBuildEvent.bat
deleted file mode 100644
index e791889134..0000000000
--- a/src/AddIns/BackendBindings/Boo/BooBinding/Project/PostBuildEvent.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-REM TODO: Replace this batch file with a ".booproj" MsBuild project
-
-REM binary is in repository, no need to always run booc
-goto copyFiles
-pushd "%1\..\..\RequiredLibraries"
-booc Boo.Microsoft.Build.Tasks.boo -t:library -o:Boo.Microsoft.Build.Tasks.dll -r:Microsoft.Build.Framework -r:Microsoft.Build.Tasks -r:Microsoft.Build.Utilities
-@IF %ERRORLEVEL% NEQ 0 GOTO BooPostBuildEventEnd
-popd
-:copyFiles
-copy "%1\..\..\RequiredLibraries\booc.*" .
-copy "%1\..\..\Boo.Microsoft.Build.Tasks\*.targets" .
-copy "%1\..\..\RequiredLibraries\Boo.Microsoft.Build.Tasks.dll" .
-:BooPostBuildEventEnd
diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Project/PostBuildEvent.proj b/src/AddIns/BackendBindings/Boo/BooBinding/Project/PostBuildEvent.proj
new file mode 100644
index 0000000000..bdd89c71e1
--- /dev/null
+++ b/src/AddIns/BackendBindings/Boo/BooBinding/Project/PostBuildEvent.proj
@@ -0,0 +1,25 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<!-- REM binary is in repository, no need to always run booc
+goto copyFiles
+pushd "%1\..\..\RequiredLibraries"
+booc Boo.Microsoft.Build.Tasks.boo -t:library -o:Boo.Microsoft.Build.Tasks.dll -r:Microsoft.Build.Framework -r:Microsoft.Build.Tasks -r:Microsoft.Build.Utilities
+@IF %ERRORLEVEL% NEQ 0 GOTO BooPostBuildEventEnd
+popd
+:copyFiles
+copy "%1\..\..\RequiredLibraries\booc.*" .
+copy "%1\..\..\Boo.Microsoft.Build.Tasks\*.targets" .
+copy "%1\..\..\RequiredLibraries\Boo.Microsoft.Build.Tasks.dll" .
+:BooPostBuildEventEnd-->
+  <PropertyGroup>
+	<PrepareForRunDependsOn>$(PrepareForRunDependsOn);MyPostBuildTarget</PrepareForRunDependsOn>
+  </PropertyGroup>
+  <ItemGroup>
+	<MyCopyItem Include="$(MSBuildProjectDirectory)\..\..\RequiredLibraries\booc.*" />
+	<MyCopyItem Include="$(MSBuildProjectDirectory)\..\..\Boo.Microsoft.Build.Tasks\*.targets" />
+	<MyCopyItem Include="$(MSBuildProjectDirectory)\..\..\RequiredLibraries\Boo.Microsoft.Build.Tasks.dll" />
+  </ItemGroup>
+  <Target Name="MyPostBuildTarget">
+    <Copy SourceFiles="@(MyCopyItem)" DestinationFolder="$(OutputPath)" />
+	<Delete Files="$(OutputPath)\FormDesigner.addin" ContinueOnError="True"/>
+  </Target>
+</Project>
diff --git a/src/AddIns/Misc/SubversionAddIn/Project/PostBuildEvent.bat b/src/AddIns/Misc/SubversionAddIn/Project/PostBuildEvent.bat
deleted file mode 100644
index 637736a9f9..0000000000
--- a/src/AddIns/Misc/SubversionAddIn/Project/PostBuildEvent.bat
+++ /dev/null
@@ -1 +0,0 @@
-copy "%1\..\RequiredLibraries\ms*" .
diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/AutostartCommands.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/AutostartCommands.cs
index cd2d8eeb32..bcd64f6ee3 100644
--- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/AutostartCommands.cs
+++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/AutostartCommands.cs
@@ -116,9 +116,10 @@ namespace ICSharpCode.Svn.Commands
 						break;
 					case StatusKind.Added:
 						if (status.Copied) {
-							MessageService.ShowError("The file has just been moved to this location, do you really want to remove it?");
-							e.Cancel = true;
-							return;
+							if (!MessageService.AskQuestion("The file has just been moved to this location, do you really want to remove it?")) {
+								e.Cancel = true;
+								return;
+							}
 						}
 						SvnClient.Instance.Client.Revert(new string[] { fullName }, e.IsDirectory);
 						return;
diff --git a/src/AddIns/Misc/SubversionAddIn/Project/SubversionAddIn.csproj b/src/AddIns/Misc/SubversionAddIn/Project/SubversionAddIn.csproj
index d08974a800..ef63da98b1 100644
--- a/src/AddIns/Misc/SubversionAddIn/Project/SubversionAddIn.csproj
+++ b/src/AddIns/Misc/SubversionAddIn/Project/SubversionAddIn.csproj
@@ -6,10 +6,9 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}</ProjectGuid>
-    <PostBuildEvent>"$(MSBuildProjectDirectory)\PostBuildEvent.bat" "$(MSBuildProjectDirectory)"</PostBuildEvent>
     <ProductVersion>8.0.50215</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <RunPostBuildEvent>OnSuccessfulBuild</RunPostBuildEvent>
+    <RunPostBuildEvent>Always</RunPostBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -102,7 +101,6 @@
       <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="Src\Gui\ProjectBrowserVisitor\OverlayIconManager.cs" />
-    <None Include="PostBuildEvent.bat" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
@@ -115,6 +113,14 @@
       <Name>ICSharpCode.Core</Name>
       <Private>False</Private>
     </ProjectReference>
+    <Content Include="..\RequiredLibraries\msvcp70.dll">
+      <Link>msvcp70.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\RequiredLibraries\msvcr70.dll">
+      <Link>msvcr70.dll</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Main/StartUp/Project/Resources/StringResources.resources b/src/Main/StartUp/Project/Resources/StringResources.resources
index edfaf25456..097be2b3ed 100644
Binary files a/src/Main/StartUp/Project/Resources/StringResources.resources and b/src/Main/StartUp/Project/Resources/StringResources.resources differ