From 3b95431162ee36d23634ddbc7cf2df91db4b438f Mon Sep 17 00:00:00 2001 From: Mikayla Hutchinson Date: Wed, 9 Jan 2019 01:41:44 -0500 Subject: Partially switch remaining projects to csproj These all have some kind of custom NuGet asset copying step that will require additional logic. --- .../MonoDevelop.UnitTesting.Tests.csproj | 21 ----------- .../MonoDevelop.UnitTesting.Tests/packages.config | 7 ---- .../MonoDevelop.UnitTesting.csproj | 42 +--------------------- .../addins/MonoDevelop.UnitTesting/packages.config | 10 ------ 4 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/packages.config delete mode 100644 main/src/addins/MonoDevelop.UnitTesting/packages.config (limited to 'main/src/addins/MonoDevelop.UnitTesting') diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/MonoDevelop.UnitTesting.Tests.csproj b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/MonoDevelop.UnitTesting.Tests.csproj index 038b342b64..22b751215f 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/MonoDevelop.UnitTesting.Tests.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/MonoDevelop.UnitTesting.Tests.csproj @@ -14,30 +14,12 @@ - - ..\..\..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - - - ..\..\..\..\packages\Microsoft.TestPlatform.ObjectModel.15.5.0-preview-20170919-04\lib\net451\Microsoft.TestPlatform.CoreUtilities.dll - - - ..\..\..\..\packages\Microsoft.TestPlatform.ObjectModel.15.5.0-preview-20170919-04\lib\net451\Microsoft.TestPlatform.PlatformAbstractions.dll - - - ..\..\..\..\packages\Microsoft.TestPlatform.ObjectModel.15.5.0-preview-20170919-04\lib\net451\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll - - - ..\..\..\..\packages\System.Collections.Immutable.1.5.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - - - ..\..\..\..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll - @@ -75,8 +57,5 @@ False - - - \ No newline at end of file diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/packages.config b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/packages.config deleted file mode 100644 index e1bc7cc738..0000000000 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj index c46aebd964..dad7a5b79c 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj @@ -15,48 +15,11 @@ - - ..\..\..\build\bin\Microsoft.CodeAnalysis.dll - False - - - ..\..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - False - - - ..\..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - False - - - ..\..\..\packages\System.Collections.Immutable.1.5.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - False - - - ..\..\..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll - False - - - ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.15.5.0-preview-20170919-04\lib\net451\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll - - - ..\..\..\packages\Microsoft.TestPlatform.TranslationLayer.15.5.0-preview-20170919-04\lib\net451\Microsoft.TestPlatform.CommunicationUtilities.dll - - - ..\..\..\packages\Microsoft.TestPlatform.TranslationLayer.15.5.0-preview-20170919-04\lib\net451\Microsoft.TestPlatform.CoreUtilities.dll - - - ..\..\..\packages\Microsoft.TestPlatform.TranslationLayer.15.5.0-preview-20170919-04\lib\net451\Microsoft.TestPlatform.PlatformAbstractions.dll - - - ..\..\..\packages\Microsoft.TestPlatform.TranslationLayer.15.5.0-preview-20170919-04\lib\net451\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll - - - ..\..\..\packages\Microsoft.TestPlatform.TranslationLayer.15.5.0-preview-20170919-04\lib\net451\Microsoft.VisualStudio.TestPlatform.Common.dll - + @@ -182,9 +145,6 @@ - - - diff --git a/main/src/addins/MonoDevelop.UnitTesting/packages.config b/main/src/addins/MonoDevelop.UnitTesting/packages.config deleted file mode 100644 index 483a5ea57a..0000000000 --- a/main/src/addins/MonoDevelop.UnitTesting/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file -- cgit v1.2.3 From 293d60a5c4b3dae68b0569cd5b0ed3c7a0ebf86b Mon Sep 17 00:00:00 2001 From: Mikayla Hutchinson Date: Fri, 11 Jan 2019 05:04:53 -0500 Subject: Fix up remaining nuget downloads --- .../MonoDevelop.UnitTesting.csproj | 24 ++++++++-------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'main/src/addins/MonoDevelop.UnitTesting') diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj index dad7a5b79c..87001e9607 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj @@ -149,22 +149,14 @@ - - false - - + + + - - - false - - - false - - - - - - -- cgit v1.2.3 From 341d537f96c51c808aeff0655a836a335c88dbb3 Mon Sep 17 00:00:00 2001 From: Mikayla Hutchinson Date: Fri, 11 Jan 2019 06:43:35 -0500 Subject: Use variable for nupkg directory --- .../addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'main/src/addins/MonoDevelop.UnitTesting') diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj index 87001e9607..57061dab26 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj @@ -151,11 +151,11 @@ -- cgit v1.2.3 From b41edbb828f7d6d5ae9b687aa1bab901d04e5965 Mon Sep 17 00:00:00 2001 From: Mikayla Hutchinson Date: Fri, 11 Jan 2019 06:59:56 -0500 Subject: Fix a couple build errors --- .../MonoDevelop.UnitTesting.VsTest/VsTestUnitTest.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main/src/addins/MonoDevelop.UnitTesting') diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestUnitTest.cs b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestUnitTest.cs index 24a5e9dcc9..8f80223bf4 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestUnitTest.cs +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestUnitTest.cs @@ -38,7 +38,7 @@ namespace MonoDevelop.UnitTesting.VsTest { class VsTestUnitTest : UnitTest, IVsTestTestProvider { - public Project Project { get; private set; } + public MonoDevelop.Projects.Project Project { get; private set; } TestCase test; IVsTestTestRunner testRunner; string name; @@ -47,7 +47,7 @@ namespace MonoDevelop.UnitTesting.VsTest protected VsTestUnitTest(string displayName) : base (displayName) { } - public VsTestUnitTest (IVsTestTestRunner testRunner, TestCase test, Project project) + public VsTestUnitTest (IVsTestTestRunner testRunner, TestCase test, MonoDevelop.Projects.Project project) : base (test.DisplayName) { this.Project = project; -- cgit v1.2.3 From e4505108161a8cff03306bab4f96a1f98b1b0850 Mon Sep 17 00:00:00 2001 From: Mikayla Hutchinson Date: Sun, 13 Jan 2019 02:23:14 -0500 Subject: Remove a metric ton of redundant local copies These tests all output into the same directory, they should not all be local copying the same references into it. --- .../MonoDevelop.UnitTesting.Tests/MonoDevelop.UnitTesting.Tests.csproj | 3 +++ 1 file changed, 3 insertions(+) (limited to 'main/src/addins/MonoDevelop.UnitTesting') diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/MonoDevelop.UnitTesting.Tests.csproj b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/MonoDevelop.UnitTesting.Tests.csproj index 22b751215f..98c4976552 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/MonoDevelop.UnitTesting.Tests.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/MonoDevelop.UnitTesting.Tests.csproj @@ -32,10 +32,12 @@ {D12F0F7B-8DE3-43EC-BA49-41052D065A9B} GuiUnit_NET_4_5 + False {1497D0A8-AFF1-4938-BC22-BE79B358BA5B} UnitTests + False {27096E7F-C91C-4AC6-B289-6897A701DF21} @@ -50,6 +52,7 @@ {A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC} MonoDevelop.UnitTesting + False {6868153E-41EA-43A4-A81A-C1E7256373F7} -- cgit v1.2.3 From e17d92257c59ee8685bb46f0c44b48a429ce9bd1 Mon Sep 17 00:00:00 2001 From: Mikayla Hutchinson Date: Sun, 13 Jan 2019 03:03:02 -0500 Subject: Suppress NuGet local copies unless explicitly listed in project NuGet's PrivateAssets="runtime" does not work, resulting in transitive references local copying their assemblies into every project. This works around that by filtering out all local copies that are not explictly listed. This also makes it much harder to accidentally introduce local copies, which is good as local copies in general are are not desirable due to the way that dlls are loaded by the extension system. --- .../addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'main/src/addins/MonoDevelop.UnitTesting') diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj index 57061dab26..264728ae52 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj @@ -20,6 +20,12 @@ + + + + + + -- cgit v1.2.3 From 925915768a3b2e8ccceae722b29608dd3f62642c Mon Sep 17 00:00:00 2001 From: Mikayla Hutchinson Date: Mon, 14 Jan 2019 01:24:24 -0500 Subject: Fix a bunch more warnings all over --- .../addins/MonoDevelop.UnitTesting/Services/AbstractResultsStore.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'main/src/addins/MonoDevelop.UnitTesting') diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractResultsStore.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractResultsStore.cs index 62b40b80b6..ba03343c15 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractResultsStore.cs +++ b/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractResultsStore.cs @@ -403,11 +403,11 @@ namespace MonoDevelop.UnitTesting [Serializable] public class TestRecordCollection: CollectionBase { - public new TestRecord this [int n] { + public TestRecord this [int n] { get { return (TestRecord) ((IList)this) [n]; } } - public new TestRecord this [string name] { + public TestRecord this [string name] { get { for (int n=0; n Date: Tue, 15 Jan 2019 21:53:37 -0500 Subject: Remove redundant build infrastructure The old autotools build infrastructure is largely redundant, as projects are now built with msbuild. Remove as much as can be done easily, along with some other obsolete stuff. --- main/src/addins/MonoDevelop.UnitTesting/Makefile.am | 1 - 1 file changed, 1 deletion(-) delete mode 100644 main/src/addins/MonoDevelop.UnitTesting/Makefile.am (limited to 'main/src/addins/MonoDevelop.UnitTesting') diff --git a/main/src/addins/MonoDevelop.UnitTesting/Makefile.am b/main/src/addins/MonoDevelop.UnitTesting/Makefile.am deleted file mode 100644 index c9cc87438f..0000000000 --- a/main/src/addins/MonoDevelop.UnitTesting/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -include $(top_srcdir)/xbuild.include -- cgit v1.2.3 From c020f37da40f25d817eae12c73f08c1faf3b235f Mon Sep 17 00:00:00 2001 From: Mikayla Hutchinson Date: Fri, 15 Feb 2019 17:03:12 -0500 Subject: Obsoletion propagation --- .../MonoDevelop.UnitTesting/Services/AbstractUnitTestEditorExtension.cs | 1 + 1 file changed, 1 insertion(+) (limited to 'main/src/addins/MonoDevelop.UnitTesting') diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractUnitTestEditorExtension.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractUnitTestEditorExtension.cs index 27464ad5b2..b10ef4840b 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractUnitTestEditorExtension.cs +++ b/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractUnitTestEditorExtension.cs @@ -42,6 +42,7 @@ using MonoDevelop.UnitTesting.Commands; namespace MonoDevelop.UnitTesting { + [Obsolete ("Needs to be ported to new editor")] public abstract class AbstractUnitTestTextEditorExtension : TextEditorExtension { const string TestMarkersPath = "/MonoDevelop/UnitTesting/UnitTestMarkers"; -- cgit v1.2.3 From 1e6127ccc8cb91089be3204c9fa8d42ee5291306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Kr=C3=BCger?= Date: Fri, 15 Feb 2019 05:15:43 +0100 Subject: Fixes VSTS Bug 781628: VSM didn't run tests with error 'vstest.console failed to connect' https://devdiv.visualstudio.com/DevDiv/_workitems/edit/781628 --- .../VsTestAdapter.cs | 2 ++ .../MonoDevelop.UnitTesting.csproj | 25 ++++++++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) (limited to 'main/src/addins/MonoDevelop.UnitTesting') diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestAdapter.cs b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestAdapter.cs index a70082fb5c..5e17f52100 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestAdapter.cs +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestAdapter.cs @@ -210,6 +210,8 @@ namespace MonoDevelop.UnitTesting.VsTest { string vsTestConsoleExeFolder = Path.Combine (Path.GetDirectoryName (typeof (VsTestAdapter).Assembly.Location), "VsTestConsole"); string vsTestConsoleExe = Path.Combine (vsTestConsoleExeFolder, "vstest.console.exe"); + if (!File.Exists (vsTestConsoleExe)) + LoggingService.LogError ("vstest.console.exe not found : " + vsTestConsoleExe); var executionCommand = Runtime.ProcessService.CreateCommand (vsTestConsoleExe); executionCommand.Arguments = GetVSTestArguments (vsTestConsoleExe, port); executionCommand.WorkingDirectory = vsTestConsoleExeFolder; diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj index 264728ae52..b96f0f2c68 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj @@ -156,13 +156,24 @@ - - + + + false + + + + + + false + + + false + + + + + + -- cgit v1.2.3 From 0f22666b4008718ed5fded959aacca3dab93ee56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Kr=C3=BCger?= Date: Thu, 28 Feb 2019 12:10:45 +0100 Subject: Fixes VSTS Bug 781628: VSM didn't run tests with error 'vstest.console failed to connect' https://devdiv.visualstudio.com/DevDiv/_workitems/edit/781628 --- .../MonoDevelop.UnitTesting.csproj | 29 +++++++++++----------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'main/src/addins/MonoDevelop.UnitTesting') diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj index b96f0f2c68..8c886db1e9 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj @@ -157,21 +157,22 @@ - - - false - - - + + - - false - - - false - - - + + false + + + + + + false + + + false + + -- cgit v1.2.3