From ec6ad9e42ef8876079c54e14669997381267e794 Mon Sep 17 00:00:00 2001
From: Matt Ward <ward.matt@gmail.com>
Date: Sun, 12 Aug 2012 13:51:50 +0100
Subject: [PATCH] Fix failing unit tests being run with MTA thread.

Setting the ApartmentState to STA in app.config is no longer supported by NUnit 2.6.1. Instead the RequiresSTA attribute needs to be used.
---
 .../Tests/CSharpBinding.Tests.csproj          |  2 --
 .../Tests/Properties/AssemblyInfo.cs          |  5 +++++
 .../CSharpBinding/Tests/app.config            | 13 ------------
 .../Python/PythonBinding/Test/AssemblyInfo.cs |  5 +++++
 .../Test/PythonBinding.Tests.csproj           |  1 -
 .../Python/PythonBinding/Test/app.config      | 14 -------------
 .../Ruby/RubyBinding/Test/AssemblyInfo.cs     |  5 +++++
 .../RubyBinding/Test/RubyBinding.Tests.csproj |  1 -
 .../Ruby/RubyBinding/Test/app.config          | 14 -------------
 .../Test/Configuration/AssemblyInfo.cs        | 20 +++++++++++++++++++
 .../Test/VBNetBinding.Tests.csproj            |  6 +++++-
 .../VBNetBinding/Test/app.config              | 13 ------------
 .../WixBinding/Test/AssemblyInfo.cs           |  5 +++++
 .../WixBinding/Test/WixBinding.Tests.csproj   |  1 -
 .../WixBinding/Test/app.config                | 15 --------------
 .../WpfDesign.Designer/Tests/AssemblyInfo.cs  |  5 +++++
 .../Tests/WpfDesign.Tests.csproj              |  1 -
 .../WpfDesign.Designer/Tests/app.config       | 15 --------------
 .../XmlEditor/Test/AssemblyInfo.cs            |  4 ++++
 .../XmlEditor/Test/XmlEditor.Tests.csproj     |  1 -
 .../DisplayBindings/XmlEditor/Test/app.config | 13 ------------
 .../Test/PackageManagement.Tests.csproj       |  1 -
 .../Test/Properties/AssemblyInfo.cs           |  4 ++++
 .../Misc/PackageManagement/Test/app.config    | 14 -------------
 .../ICSharpCode.AvalonEdit.Tests.csproj       |  1 -
 .../Properties/AssemblyInfo.cs                |  5 +++++
 .../ICSharpCode.AvalonEdit.Tests/app.config   | 15 --------------
 27 files changed, 63 insertions(+), 136 deletions(-)
 delete mode 100644 src/AddIns/BackendBindings/CSharpBinding/Tests/app.config
 delete mode 100644 src/AddIns/BackendBindings/Python/PythonBinding/Test/app.config
 delete mode 100644 src/AddIns/BackendBindings/Ruby/RubyBinding/Test/app.config
 create mode 100644 src/AddIns/BackendBindings/VBNetBinding/Test/Configuration/AssemblyInfo.cs
 delete mode 100644 src/AddIns/BackendBindings/VBNetBinding/Test/app.config
 delete mode 100644 src/AddIns/BackendBindings/WixBinding/Test/app.config
 delete mode 100644 src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/app.config
 delete mode 100644 src/AddIns/DisplayBindings/XmlEditor/Test/app.config
 delete mode 100644 src/AddIns/Misc/PackageManagement/Test/app.config
 delete mode 100644 src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/app.config

diff --git a/src/AddIns/BackendBindings/CSharpBinding/Tests/CSharpBinding.Tests.csproj b/src/AddIns/BackendBindings/CSharpBinding/Tests/CSharpBinding.Tests.csproj
index 21fb8de070..9ce68cb22f 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Tests/CSharpBinding.Tests.csproj
+++ b/src/AddIns/BackendBindings/CSharpBinding/Tests/CSharpBinding.Tests.csproj
@@ -68,8 +68,6 @@
     <Compile Include="MockTextEditor.cs" />
     <Compile Include="OverrideCompletionTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <None Include="app.config">
-    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj">
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Tests/Properties/AssemblyInfo.cs b/src/AddIns/BackendBindings/CSharpBinding/Tests/Properties/AssemblyInfo.cs
index 29c6765c25..0d380a97fc 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Tests/Properties/AssemblyInfo.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Tests/Properties/AssemblyInfo.cs
@@ -7,6 +7,8 @@ using System;
 using System.Reflection;
 using System.Runtime.InteropServices;
 
+using NUnit.Framework;
+
 #endregion
 
 // General Information about an assembly is controlled through the following 
@@ -32,3 +34,6 @@ using System.Runtime.InteropServices;
 // 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("1.0.*")]
+
+// Run unit tests on STA thread.
+[assembly: RequiresSTA]
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Tests/app.config b/src/AddIns/BackendBindings/CSharpBinding/Tests/app.config
deleted file mode 100644
index e310f3b4b1..0000000000
--- a/src/AddIns/BackendBindings/CSharpBinding/Tests/app.config
+++ /dev/null
@@ -1,13 +0,0 @@
-<configuration>
-	<configSections>
-		<sectionGroup name="NUnit">
-			<section name="TestRunner" type="System.Configuration.NameValueSectionHandler" />
-		</sectionGroup>
-	</configSections>
-	<NUnit>
-		<TestRunner>
-			<!-- Valid values are STA,MTA. Others ignored. -->
-			<add key="ApartmentState" value="STA" />
-		</TestRunner>
-	</NUnit>
-</configuration>
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/AssemblyInfo.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/AssemblyInfo.cs
index a22fd81106..71c275657a 100644
--- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/AssemblyInfo.cs
+++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/AssemblyInfo.cs
@@ -5,6 +5,8 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
+using NUnit.Framework;
+
 // Information about this assembly is defined by the following
 // attributes.
 //
@@ -32,3 +34,6 @@ using System.Runtime.InteropServices;
 // numbers with the '*' character (the default):
 
 [assembly: AssemblyVersion("0.3")]
+
+// Run unit tests on STA thread.
+[assembly: RequiresSTA]
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj
index 1d3876c6fe..52aa820cd5 100644
--- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj
+++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj
@@ -437,7 +437,6 @@
     <EmbeddedResource Include="..\Project\PythonBinding.addin">
       <Link>PythonBinding.addin</Link>
     </EmbeddedResource>
-    <None Include="app.config" />
     <Compile Include="Parsing\AddInvalidSourceSpanToErrorSinkTestFixture.cs" />
     <Compile Include="Utils\PythonBindingAddInFile.cs" />
     <Compile Include="Utils\PythonCompletionItemsHelper.cs" />
diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/app.config b/src/AddIns/BackendBindings/Python/PythonBinding/Test/app.config
deleted file mode 100644
index f2bc417595..0000000000
--- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/app.config
+++ /dev/null
@@ -1,14 +0,0 @@
-<configuration>
-	<configSections>
-		<sectionGroup name="NUnit">
-			<section name="TestRunner"
-			         type="System.Configuration.NameValueSectionHandler" />
-		</sectionGroup>
-	</configSections>
-	<NUnit>
-		<TestRunner>
-			<!-- Valid values are STA,MTA. Others ignored. -->
-			<add key="ApartmentState" value="STA" />
-		</TestRunner>
-	</NUnit>
-</configuration>
diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/AssemblyInfo.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/AssemblyInfo.cs
index 47e221a4cd..26ff892f21 100644
--- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/AssemblyInfo.cs
+++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/AssemblyInfo.cs
@@ -7,6 +7,8 @@ using System;
 using System.Reflection;
 using System.Runtime.InteropServices;
 
+using NUnit.Framework;
+
 #endregion
 
 // General Information about an assembly is controlled through the following 
@@ -32,3 +34,6 @@ using System.Runtime.InteropServices;
 // 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("1.0.*")]
+
+// Run unit tests on STA thread.
+[assembly: RequiresSTA]
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyBinding.Tests.csproj b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyBinding.Tests.csproj
index e1a0a9b7cf..a246d6a630 100644
--- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyBinding.Tests.csproj
+++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyBinding.Tests.csproj
@@ -318,7 +318,6 @@
     <EmbeddedResource Include="..\Project\RubyBinding.addin">
       <Link>RubyBinding.addin</Link>
     </EmbeddedResource>
-    <None Include="app.config" />
     <EmbeddedResource Include="Designer\App.ico" />
     <EmbeddedResource Include="Strings.resx" />
   </ItemGroup>
diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/app.config b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/app.config
deleted file mode 100644
index f2bc417595..0000000000
--- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/app.config
+++ /dev/null
@@ -1,14 +0,0 @@
-<configuration>
-	<configSections>
-		<sectionGroup name="NUnit">
-			<section name="TestRunner"
-			         type="System.Configuration.NameValueSectionHandler" />
-		</sectionGroup>
-	</configSections>
-	<NUnit>
-		<TestRunner>
-			<!-- Valid values are STA,MTA. Others ignored. -->
-			<add key="ApartmentState" value="STA" />
-		</TestRunner>
-	</NUnit>
-</configuration>
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Test/Configuration/AssemblyInfo.cs b/src/AddIns/BackendBindings/VBNetBinding/Test/Configuration/AssemblyInfo.cs
new file mode 100644
index 0000000000..e9174e0526
--- /dev/null
+++ b/src/AddIns/BackendBindings/VBNetBinding/Test/Configuration/AssemblyInfo.cs
@@ -0,0 +1,20 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System.Reflection;
+using NUnit.Framework;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("VBNetBinding.Tests")]
+[assembly: AssemblyDescription("VB.NET language binding for #develop")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Run unit tests on STA thread.
+[assembly: RequiresSTA]
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Test/VBNetBinding.Tests.csproj b/src/AddIns/BackendBindings/VBNetBinding/Test/VBNetBinding.Tests.csproj
index 2f1bb750be..10a9920dc7 100644
--- a/src/AddIns/BackendBindings/VBNetBinding/Test/VBNetBinding.Tests.csproj
+++ b/src/AddIns/BackendBindings/VBNetBinding/Test/VBNetBinding.Tests.csproj
@@ -57,9 +57,14 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\..\..\Main\GlobalAssemblyInfo.cs">
+      <Link>Configuration\GlobalAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="Configuration\AssemblyInfo.cs" />
     <Compile Include="LanguageUtilsTests.cs" />
     <Compile Include="MockTextEditor.cs" />
     <Compile Include="TextEditorBasedTests.cs" />
+    <Folder Include="Configuration" />
     <ProjectReference Include="..\..\..\..\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj">
       <Project>{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}</Project>
       <Name>ICSharpCode.AvalonEdit</Name>
@@ -86,7 +91,6 @@
     <Compile Include="FormattingStrategy\EndSubTests.cs" />
     <Compile Include="FormattingStrategy\IndentationTests.cs" />
     <Compile Include="FormattingStrategy\InterfaceTests.cs" />
-    <None Include="app.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/VBNetBinding/Test/app.config b/src/AddIns/BackendBindings/VBNetBinding/Test/app.config
deleted file mode 100644
index e310f3b4b1..0000000000
--- a/src/AddIns/BackendBindings/VBNetBinding/Test/app.config
+++ /dev/null
@@ -1,13 +0,0 @@
-<configuration>
-	<configSections>
-		<sectionGroup name="NUnit">
-			<section name="TestRunner" type="System.Configuration.NameValueSectionHandler" />
-		</sectionGroup>
-	</configSections>
-	<NUnit>
-		<TestRunner>
-			<!-- Valid values are STA,MTA. Others ignored. -->
-			<add key="ApartmentState" value="STA" />
-		</TestRunner>
-	</NUnit>
-</configuration>
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/WixBinding/Test/AssemblyInfo.cs b/src/AddIns/BackendBindings/WixBinding/Test/AssemblyInfo.cs
index 9fe99cb6f0..826c565014 100644
--- a/src/AddIns/BackendBindings/WixBinding/Test/AssemblyInfo.cs
+++ b/src/AddIns/BackendBindings/WixBinding/Test/AssemblyInfo.cs
@@ -5,6 +5,8 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
+using NUnit.Framework;
+
 // Information about this assembly is defined by the following
 // attributes.
 //
@@ -32,3 +34,6 @@ using System.Runtime.InteropServices;
 // numbers with the '*' character (the default):
 
 [assembly: AssemblyVersion("2.0.0.1")]
+
+// Run unit tests on STA thread.
+[assembly: RequiresSTA]
\ No newline at end of file
diff --git a/src/AddIns/BackendBindings/WixBinding/Test/WixBinding.Tests.csproj b/src/AddIns/BackendBindings/WixBinding/Test/WixBinding.Tests.csproj
index 5d2b677729..63a4b61e57 100644
--- a/src/AddIns/BackendBindings/WixBinding/Test/WixBinding.Tests.csproj
+++ b/src/AddIns/BackendBindings/WixBinding/Test/WixBinding.Tests.csproj
@@ -301,7 +301,6 @@
     <Compile Include="Diff\SameFileReferencedTwiceTestFixture.cs" />
     <Compile Include="Project\CanCompileTests.cs" />
     <Compile Include="DirectoryImport\AddDirectoryWithInvalidIdCharsTestFixture.cs" />
-    <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Utils\Tests" />
diff --git a/src/AddIns/BackendBindings/WixBinding/Test/app.config b/src/AddIns/BackendBindings/WixBinding/Test/app.config
deleted file mode 100644
index 2400cda528..0000000000
--- a/src/AddIns/BackendBindings/WixBinding/Test/app.config
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-	<configSections>
-		<sectionGroup name="NUnit">
-			<section name="TestRunner"
-			         type="System.Configuration.NameValueSectionHandler" />
-		</sectionGroup>
-	</configSections>
-	<NUnit>
-		<TestRunner>
-			<!-- Valid values are STA,MTA. Others ignored. -->
-			<add key="ApartmentState" value="STA" />
-		</TestRunner>
-	</NUnit>
-</configuration>
\ No newline at end of file
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/AssemblyInfo.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/AssemblyInfo.cs
index 11bb791e79..80a76efffd 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/AssemblyInfo.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/AssemblyInfo.cs
@@ -5,6 +5,8 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
+using NUnit.Framework;
+
 // Information about this assembly is defined by the following
 // attributes.
 //
@@ -16,3 +18,6 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+
+// Run unit tests on STA thread.
+[assembly: RequiresSTA]
\ No newline at end of file
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj
index 9e44f48ec5..fa34cacfb2 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj
@@ -75,7 +75,6 @@
     <Compile Include="XamlDom\TestHelper.cs" />
     <Compile Include="XamlDom\WhitespaceTests.cs" />
     <Compile Include="XamlDom\XamlTypeFinderTests.cs" />
-    <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj">
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/app.config b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/app.config
deleted file mode 100644
index e531f7e030..0000000000
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/app.config
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-	<configSections>
-		<sectionGroup name="NUnit">
-			<section name="TestRunner"
-			         type="System.Configuration.NameValueSectionHandler" />
-		</sectionGroup>
-	</configSections>
-	<NUnit>
-		<TestRunner>
-			<!-- Valid values are STA,MTA. Others ignored. -->
-			<add key="ApartmentState" value="STA" />
-		</TestRunner>
-	</NUnit>
-</configuration>
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/AssemblyInfo.cs b/src/AddIns/DisplayBindings/XmlEditor/Test/AssemblyInfo.cs
index 3c02142f6b..7a5c3f023b 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/AssemblyInfo.cs
+++ b/src/AddIns/DisplayBindings/XmlEditor/Test/AssemblyInfo.cs
@@ -3,6 +3,7 @@
 
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using NUnit.Framework;
 
 // Information about this assembly is defined by the following
 // attributes.
@@ -33,3 +34,6 @@ using System.Runtime.CompilerServices;
 // This is not required, if you don't want signing let these attributes like they're.
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
+
+// Run unit tests on STA thread.
+[assembly: RequiresSTA]
\ No newline at end of file
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/XmlEditor.Tests.csproj b/src/AddIns/DisplayBindings/XmlEditor/Test/XmlEditor.Tests.csproj
index 7aed7b41dd..7ee3350bd9 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/XmlEditor.Tests.csproj
+++ b/src/AddIns/DisplayBindings/XmlEditor/Test/XmlEditor.Tests.csproj
@@ -335,7 +335,6 @@
     <Compile Include="Tree\InsertElementBeforeTestFixture.cs" />
     <Compile Include="Tree\AddElementsToTreeControlTestFixture.cs" />
     <Compile Include="Tree\InsertElementAfterTestFixture.cs" />
-    <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Completion" />
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/app.config b/src/AddIns/DisplayBindings/XmlEditor/Test/app.config
deleted file mode 100644
index f1f39768e4..0000000000
--- a/src/AddIns/DisplayBindings/XmlEditor/Test/app.config
+++ /dev/null
@@ -1,13 +0,0 @@
-<configuration>
-	<configSections>
-		<sectionGroup name="NUnit">
-			<section name="TestRunner" type="System.Configuration.NameValueSectionHandler" />
-		</sectionGroup>
-	</configSections>
-	<NUnit>
-		<TestRunner>
-			<!-- Valid values are STA,MTA. Others ignored. -->
-			<add key="ApartmentState" value="STA" />
-		</TestRunner>
-	</NUnit>
-</configuration>
diff --git a/src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj b/src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj
index dfbaa9f2e8..d2a525e750 100644
--- a/src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj
+++ b/src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj
@@ -371,7 +371,6 @@
       <Link>SharpDevelop.exe</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="app.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>
\ No newline at end of file
diff --git a/src/AddIns/Misc/PackageManagement/Test/Properties/AssemblyInfo.cs b/src/AddIns/Misc/PackageManagement/Test/Properties/AssemblyInfo.cs
index 0750934fe0..af161af03f 100644
--- a/src/AddIns/Misc/PackageManagement/Test/Properties/AssemblyInfo.cs
+++ b/src/AddIns/Misc/PackageManagement/Test/Properties/AssemblyInfo.cs
@@ -2,6 +2,7 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System.Reflection;
+using NUnit.Framework;
 
 // Information about this assembly is defined by the following
 // attributes.
@@ -14,3 +15,6 @@ using System.Reflection;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+
+// Run unit tests on STA thread.
+[assembly: RequiresSTA]
\ No newline at end of file
diff --git a/src/AddIns/Misc/PackageManagement/Test/app.config b/src/AddIns/Misc/PackageManagement/Test/app.config
deleted file mode 100644
index f10bb38ca6..0000000000
--- a/src/AddIns/Misc/PackageManagement/Test/app.config
+++ /dev/null
@@ -1,14 +0,0 @@
-<configuration>
-	<configSections>
-		<sectionGroup name="NUnit">
-			<section name="TestRunner"
-			         type="System.Configuration.NameValueSectionHandler" />
-		</sectionGroup>
-	</configSections>
-	<NUnit>
-		<TestRunner>
-			<!-- Valid values are STA,MTA. Others ignored. -->
-			<add key="ApartmentState" value="STA" />
-		</TestRunner>
-	</NUnit>
-</configuration>
\ No newline at end of file
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/ICSharpCode.AvalonEdit.Tests.csproj b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/ICSharpCode.AvalonEdit.Tests.csproj
index 0b0d6958ec..41d0b25aff 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/ICSharpCode.AvalonEdit.Tests.csproj
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/ICSharpCode.AvalonEdit.Tests.csproj
@@ -94,7 +94,6 @@
     <Compile Include="WeakReferenceTests.cs" />
     <Compile Include="XmlParser\ParserTests.cs" />
     <Compile Include="XmlParser\TextReplacementTests.cs" />
-    <None Include="app.config" />
     <None Include="XmlParser\W3C.zip">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/Properties/AssemblyInfo.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/Properties/AssemblyInfo.cs
index 2e5bb393b8..8105e52c12 100644
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/Properties/AssemblyInfo.cs
+++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/Properties/AssemblyInfo.cs
@@ -7,6 +7,8 @@ using System;
 using System.Reflection;
 using System.Runtime.InteropServices;
 
+using NUnit.Framework;
+
 #endregion
 
 // General Information about an assembly is controlled through the following 
@@ -31,3 +33,6 @@ using System.Runtime.InteropServices;
 // 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("1.0.*")]
+
+// Run unit tests on STA thread.
+[assembly: RequiresSTA]
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/app.config b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/app.config
deleted file mode 100644
index 2400cda528..0000000000
--- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit.Tests/app.config
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-	<configSections>
-		<sectionGroup name="NUnit">
-			<section name="TestRunner"
-			         type="System.Configuration.NameValueSectionHandler" />
-		</sectionGroup>
-	</configSections>
-	<NUnit>
-		<TestRunner>
-			<!-- Valid values are STA,MTA. Others ignored. -->
-			<add key="ApartmentState" value="STA" />
-		</TestRunner>
-	</NUnit>
-</configuration>
\ No newline at end of file