[UnitTesting] Disable tests if .NET Core not installed

mrward · mrward · commit feff4747beec · 2017-10-24T16:39:29.000+01:00
Downgrade the .NET Core project to version 1.1 to avoid the pop-up
dialog asking to install .NET Core 2.0.

Fix test names not matching the projects being tested.
diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/BasicTests.cs b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.Tests/BasicTests.cs
@@ -23,6 +23,7 @@
 using System.Linq;
 using MonoDevelop.Ide;
 using MonoDevelop.Core;
+using MonoDevelop.DotNetCore;
 using System.Diagnostics;
 using System.Threading;
 
@@ -42,13 +43,17 @@ public void Start()
 		[Test()]
 		public async Task TestsXUnitDotNetFull()
 		{
-			await CommonTestDiscovery("unit-testing-xunit-dotnetcore");
+			await CommonTestDiscovery("unit-testing-xunit-dotnetfull");
 		}
 
 		[Test()]
 		public async Task TestsXUnitDotNetCore()
 		{
-			await CommonTestDiscovery("unit-testing-xunit-dotnetfull");
+			if (!DotNetCoreRuntime.IsInstalled) {
+				Assert.Ignore (".NET Core needs to be installed.");
+			}
+
+			await CommonTestDiscovery("unit-testing-xunit-dotnetcore");
 		}
 
 		async Task CommonTestDiscovery(string projectName)
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
@@ -83,6 +83,11 @@
       <Project>{A7A4246D-CEC4-42DF-A3C1-C31B9F51C4EC}</Project>
       <Name>MonoDevelop.UnitTesting</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\MonoDevelop.DotNetCore\MonoDevelop.DotNetCore.csproj">
+      <Project>{6868153E-41EA-43A4-A81A-C1E7256373F7}</Project>
+      <Name>MonoDevelop.DotNetCore</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/main/tests/test-projects/unit-testing-addin/unit-testing-xunit-dotnetcore/unit-testing-xunit-dotnetcore.csproj b/main/tests/test-projects/unit-testing-addin/unit-testing-xunit-dotnetcore/unit-testing-xunit-dotnetcore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`using System.Linq;`
`24`	`24`	`using MonoDevelop.Ide;`
`25`	`25`	`using MonoDevelop.Core;`
	`26`	`+using MonoDevelop.DotNetCore;`
`26`	`27`	`using System.Diagnostics;`
`27`	`28`	`using System.Threading;`
`28`	`29`
`@@ -42,13 +43,17 @@ public void Start()`
`42`	`43`	`[Test()]`
`43`	`44`	`public async Task TestsXUnitDotNetFull()`
`44`	`45`	`{`
`45`		`- await CommonTestDiscovery("unit-testing-xunit-dotnetcore");`
	`46`	`+ await CommonTestDiscovery("unit-testing-xunit-dotnetfull");`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`[Test()]`
`49`	`50`	`public async Task TestsXUnitDotNetCore()`
`50`	`51`	`{`
`51`		`- await CommonTestDiscovery("unit-testing-xunit-dotnetfull");`
	`52`	`+ if (!DotNetCoreRuntime.IsInstalled) {`
	`53`	`+ Assert.Ignore (".NET Core needs to be installed.");`
	`54`	`+ }`
	`55`	`+`
	`56`	`+ await CommonTestDiscovery("unit-testing-xunit-dotnetcore");`
`52`	`57`	`}`
`53`	`58`
`54`	`59`	`async Task CommonTestDiscovery(string projectName)`