diff options
| author | Dmytro Ovcharov <dmytro.ovcharov@globallogic.com> | 2017-11-24 15:09:41 +0300 |
|---|---|---|
| committer | Dmytro Ovcharov <dmytro.ovcharov@globallogic.com> | 2017-11-24 15:09:41 +0300 |
| commit | 289c43e689b683b7fc5edfa75fde3eb59deb4106 (patch) | |
| tree | f6ca6c0c57b06b10c9de2b8e14d58bfe188db754 /main/src | |
| parent | 2fdccb3e39fe45de54575939912551a35c00cbba (diff) | |
Changed exception catching logic in NUnitAssemblyTestSuit and removed updating for project references
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyTestSuite.cs | 10 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectReference.cs | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyTestSuite.cs b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyTestSuite.cs index 4429551d76..65269df490 100644 --- a/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyTestSuite.cs +++ b/main/src/addins/MonoDevelop.UnitTesting.NUnit/MonoDevelop.UnitTesting.NUnit/NUnitAssemblyTestSuite.cs @@ -334,9 +334,13 @@ namespace MonoDevelop.UnitTesting.NUnit runner.Connect (ld.NUnitVersion).Wait (); ld.Info = runner.GetTestInfo (ld.Path, ld.SupportAssemblies).Result; } - } catch (Exception ex) {
- Console.WriteLine (ex.InnerException); - ld.Error = ex.InnerException; + } catch (AggregateException exception){ + var baseException = exception.GetBaseException (); + Console.WriteLine (baseException); + ld.Error = baseException; + } catch (Exception exception) { + Console.WriteLine (exception); + ld.Error = exception; } finally { try { diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectReference.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectReference.cs index 434adc7949..12d4b8176f 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectReference.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectReference.cs @@ -629,7 +629,7 @@ namespace MonoDevelop.Projects void UpdatePackageReference () { - if ((referenceType == ReferenceType.Package || referenceType == ReferenceType.Project) && ownerProject != null) { + if (referenceType == ReferenceType.Package && ownerProject != null) { notFound = false; string cref = AssemblyContext.FindInstalledAssembly (reference, package, ownerProject.TargetFramework); if (cref == null) |