diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.csproj | 14 | ||||
| -rw-r--r-- | main/src/addins/MonoDevelop.PackageManagement/lib/nunit.framework.dll | bin | 147456 -> 0 bytes | |||
| -rw-r--r-- | main/tests/Makefile.am | 1 |
4 files changed, 12 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 646da96d02..9879dd21ee 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,6 @@ obj/ /main/tests/Ide.Tests/bin /main/src/addins/MonoDevelop.Debugger.Win32/CorApi/bin /main/src/addins/MonoDevelop.Debugger.Win32/CorApi2/bin -/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/bin/ #VS writes these sometimes even when it doesn't change anything /main/_UpgradeReport_Files diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.csproj b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.csproj index 0cfab1507e..ddfecf22e3 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.csproj +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Tests/MonoDevelop.PackageManagement.Tests.csproj @@ -11,6 +11,8 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> + <TestRunnerCommand>..\..\..\..\build\bin\mdtool.exe</TestRunnerCommand> + <TestRunnerArgs>run-md-tests</TestRunnerArgs> </PropertyGroup> <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> @@ -33,19 +35,19 @@ </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <WarningLevel>4</WarningLevel> + <OutputPath>..\..\..\..\build\tests</OutputPath> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <WarningLevel>4</WarningLevel> + <OutputPath>..\..\..\..\build\tests</OutputPath> </PropertyGroup> <ItemGroup> - <Reference Include="nunit.framework"> - <HintPath>..\lib\nunit.framework.dll</HintPath> - </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Xml" /> <Reference Include="NuGet.Core"> <HintPath>..\lib\NuGet.Core.dll</HintPath> + <Private>False</Private> </Reference> </ItemGroup> <ItemGroup> @@ -56,10 +58,16 @@ <ProjectReference Include="..\..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj"> <Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project> <Name>MonoDevelop.Core</Name> + <Private>False</Private> </ProjectReference> <ProjectReference Include="..\MonoDevelop.PackageManagement.csproj"> <Project>{F218643D-2E74-4309-820E-206A54B7133F}</Project> <Name>MonoDevelop.PackageManagement</Name> + <Private>False</Private> + </ProjectReference> + <ProjectReference Include="..\..\..\..\external\guiunit\src\framework\GuiUnit_NET_4_0.csproj"> + <Project>{E13A0A7B-4DE6-43ED-A139-41052D065A9B}</Project> + <Name>GuiUnit_NET_4_0</Name> </ProjectReference> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> diff --git a/main/src/addins/MonoDevelop.PackageManagement/lib/nunit.framework.dll b/main/src/addins/MonoDevelop.PackageManagement/lib/nunit.framework.dll Binary files differdeleted file mode 100644 index 3e24ba1ca6..0000000000 --- a/main/src/addins/MonoDevelop.PackageManagement/lib/nunit.framework.dll +++ /dev/null diff --git a/main/tests/Makefile.am b/main/tests/Makefile.am index dedea8860f..2e6e251bf0 100644 --- a/main/tests/Makefile.am +++ b/main/tests/Makefile.am @@ -28,6 +28,7 @@ TEST_ASSEMBLIES_COMMON = \ $(TEST_DIR)/UnitTests.dll \ $(TEST_DIR)/MonoDevelop.Debugger.Tests.dll \ $(TEST_DIR)/Mono.TextTemplating.Tests.dll \ + $(TEST_DIR)/MonoDevelop.PackageManagement.Tests.dll \ $(TEST_DIR)/MonoDevelop.TextEditor.Tests.dll \ $(TEST_DIR)/MonoDevelop.XmlEditor.Tests.dll \ $(EXTERNAL)/nrefactory/bin/Debug/ICSharpCode.NRefactory.Tests.dll |