diff options
| author | therzok <marius.ungureanu@xamarin.com> | 2019-12-02 16:39:01 +0300 |
|---|---|---|
| committer | monojenkins <jo.shields+jenkins@xamarin.com> | 2019-12-03 11:54:19 +0300 |
| commit | 6429157bc3abf09796c4d6efc8f1ef8282e3a09f (patch) | |
| tree | 30b02c10c33b06c60eb7f80609f53cbfb06f78ee /main | |
| parent | a2ab6b17b3cdbb3b234f07f5fd2c8bfe771c845f (diff) | |
Revert "Initialize the composition manager in version control tests"
This reverts commit de1559fa525c8b5a1a59619d7db391ae806fd06f.
Diffstat (limited to 'main')
4 files changed, 2 insertions, 19 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/BaseRepositoryTests.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/BaseRepositoryTests.cs index fdfedc7e6b..5a903781ba 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/BaseRepositoryTests.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/BaseRepositoryTests.cs @@ -53,13 +53,11 @@ namespace MonoDevelop.VersionControl.Tests protected int CommitNumber = 0; [SetUp] - public virtual async Task Setup () + public virtual Task Setup () { - // Load this on setup, otherwise we'll get into a deadlock. - await Runtime.GetService<Ide.Composition.CompositionManager> (); - var vcs = Repo.VersionControlSystem; Console.WriteLine ("Running {0} for {1} (v{2})", TestContext.CurrentContext.Test.FullName, vcs.Name, vcs.Version); + return Task.CompletedTask; } [TearDown] diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj index cf4cbfacb3..683ac2c4b6 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj @@ -57,11 +57,6 @@ <Name>MonoDevelop.SourceEditor</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj"> - <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project> - <Name>MonoDevelop.Ide</Name> - <Private>False</Private> - </ProjectReference> </ItemGroup> <ItemGroup> <IncludeCopyLocal Include="LibGit2Sharp.dll" /> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Tests/MonoDevelop.VersionControl.Subversion.Tests.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Tests/MonoDevelop.VersionControl.Subversion.Tests.csproj index f5201c3311..9d1b8549ea 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Tests/MonoDevelop.VersionControl.Subversion.Tests.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Tests/MonoDevelop.VersionControl.Subversion.Tests.csproj @@ -55,11 +55,6 @@ <Project>{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}</Project> <Name>GuiUnit_NET_4_5</Name> </ProjectReference> - <ProjectReference Include="..\..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj"> - <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project> - <Name>MonoDevelop.Ide</Name> - <Private>False</Private> - </ProjectReference> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> </Project>
\ No newline at end of file diff --git a/main/src/addins/VersionControl/Subversion.Win32.Tests/VersionControl.Subversion.Win32.Tests.csproj b/main/src/addins/VersionControl/Subversion.Win32.Tests/VersionControl.Subversion.Win32.Tests.csproj index 7f043547c5..e06c1dddd1 100644 --- a/main/src/addins/VersionControl/Subversion.Win32.Tests/VersionControl.Subversion.Win32.Tests.csproj +++ b/main/src/addins/VersionControl/Subversion.Win32.Tests/VersionControl.Subversion.Win32.Tests.csproj @@ -51,11 +51,6 @@ <Name>GuiUnit_NET_4_5</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj"> - <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project> - <Name>MonoDevelop.Ide</Name> - <Private>False</Private> - </ProjectReference> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> </Project> |