Show .net core not supported message

Author: DanielHWe

pom.xml

@@ -5,7 +5,7 @@
   <groupId>org.sonarsource.dotnet</groupId>
   <artifactId>sonar-fxcop-plugin</artifactId>
   <packaging>sonar-plugin</packaging>
-  <version>1.4_SNAPSHOT</version>
+  <version>1.4_BETA2</version>
 
   <name>SonarQube FxCop Plugin</name>
   <description>Enables scanning of C#/VB.NET source files with FxCop</description>

src/main/java/org/sonar/plugins/fxcop/CSharpProjectInfo.java

@@ -33,20 +33,30 @@ public class CSharpProjectInfo {
 		performOnNetCore();
 		checkAllRequiredValuesFound();
 	}
+	
+	public boolean IsDotNetCore(){
+		if (targetFramework==null)return false;
+		return targetFramework.toLowerCase().contains("netcoreapp");
+	}
 
 	private void performOnNetCore() {
 		//Net core project files contain only non default settings, so set defaults if not set
 		if (targetFramework!=null && targetFramework.startsWith("netcoreapp")){
 			if (paths.isEmpty()) {
 				paths.add(convertPath("bin\\Debug\\netcoreapp2.0"));
 				paths.add(convertPath("bin\\Release\\netcoreapp2.0"));
+				paths.add(convertPath("bin\\Debug\\netcoreapp2.1"));
+				paths.add(convertPath("bin\\Release\\netcoreapp2.1"));
+				LOG.debug("Set Outputpath to default");
 			}
 			if (type == null){
 				type = "Library";
+				LOG.debug("Set OutputType to default (Library)");
 			}
 			if (name == null) {
 				File projectFile = new File(project);
 				name = projectFile.getName().replace(".csproj", "");
+				LOG.debug("Set AssemblyName to default ("+name+")");
 			}
 		}
 
@@ -76,18 +86,23 @@ private void scanProjectFile() throws IOException {
 	    	   Matcher m = patternType.matcher(currentLine);
 	           if (m.find()) {
 	        	   type = (m.group(1));
+	        	   LOG.debug("Found OutputType ("+type+")");
 	           }
 	           m = patternName.matcher(currentLine);
 	           if (m.find()) {
 	        	   name = (m.group(1));
+	        	   LOG.debug("Found AssemblyName ("+name+")");
 	           }
 	           m = patternPath.matcher(currentLine);
 	           if (m.find()) {
-	        	   paths.add(convertPath(m.group(1)));	        	   
+	        	   String path = convertPath(m.group(1));
+	        	   paths.add(path);
+	        	   LOG.debug("Found OutputPath ("+path+")");
 	           }
 	           m = patternTargetFramework.matcher(currentLine);
 	           if (m.find()) {
-	        	   targetFramework = m.group(1);	        	   
+	        	   targetFramework = m.group(1);	
+	        	   LOG.debug("Found TargetFramework ("+targetFramework+")");
 	           }
 	       }
 		} finally {

src/main/java/org/sonar/plugins/fxcop/FxCopProjectGenerator.java

@@ -62,7 +62,8 @@ private String[] getTargetFiles(File slnFileObj) {
 
 	private void addProjectAssemblyIfExists(List<String> targetFileList, String project) throws IOException {
 		try {
-			targetFileList.add(getDllPathFromCsProj(project));
+			String proj = getDllPathFromCsProj(project); 
+			if (proj != null) targetFileList.add(proj);
 		} catch (IllegalArgumentException iae){
 			LOG.warn("Ignore '"+project+"' due to parsing error.");
 		}
@@ -76,6 +77,10 @@ public String getDllPathFromCsProj(String project) throws IOException {
 		//Pattern.matches("<OutputType>(\\w+)</OutputType>", input)
 
 		CSharpProjectInfo projectInfo = new CSharpProjectInfo(project);
+		if (projectInfo.IsDotNetCore()) {
+			LOG.warn(".net core is not supported by FxCop - project " + project + " ignored.");
+			return null;
+		}
 		return projectInfo.getDllPathFromExistingBinary();
 
 	}

src/main/java/org/sonar/plugins/fxcop/FxCopSensor.java

@@ -201,15 +201,7 @@ private String getSlnNameByProperty(SensorContext context, File baseDir) {
   private File executeFxCop(FxCopRulesetWriter writer, FxCopExecutor executor, SensorContext context, Settings settings) {
 	File reportFile;
 	String workDirPath = context.fileSystem().workDir().getAbsolutePath();
-	String projectName = settings.getString("sonar.projectName");
-	if (projectName!=null){
-		//workDirPath = workDirPath.replaceAll(projectName, "");
-		LOG.info("Project name: " + projectName);
-		File workDir = new File(workDirPath);
-		if (!workDir.exists()){
-			workDir.mkdirs();
-		}
-	}
+	workDirPath = TrimWorkdir(settings, workDirPath);
 
 	File rulesetFile = new File(workDirPath, "fxcop-sonarqube.ruleset");
       writer.write(enabledRuleConfigKeys(context.activeRules()), rulesetFile);
@@ -229,6 +221,20 @@ private File executeFxCop(FxCopRulesetWriter writer, FxCopExecutor executor, Sen
 	return reportFile;
   }
 
+private String TrimWorkdir(Settings settings, String workDirPath) {
+	String projectKey = settings.getString("sonar.projectKey");
+	if (projectKey!=null && !projectKey.isEmpty() /*&& projectKey.matches("[a-zA-Z0-9_-]:[a-zA-Z0-9_-]:[a-zA-Z0-9_-]")*/){
+		workDirPath = workDirPath.replace(projectKey.replace(":", ""), projectKey.substring(projectKey.indexOf(':')));
+		LOG.info("Project key: " + projectKey);
+		LOG.info("Work Dir: " + workDirPath);
+		File workDir = new File(workDirPath);
+		if (!workDir.exists()){
+			workDir.mkdirs();
+		}
+	}
+	return workDirPath;
+}
+
   private void parseReportFile(FxCopReportParser parser, SensorContext context, File reportFile) {
 	  int count = 0;
 	for (FxCopIssue issue : parser.parse(reportFile)) {

src/test/java/org/sonar/plugins/fxcop/FxCopProjectGeneratorTest.java

@@ -82,7 +82,7 @@ public void testGenerate() throws IOException {
 
 	  }
 
-	  @Test
+	  @Test(expected = IllegalArgumentException.class)
 	  public void testGenerateCore() throws IOException {
 		  FxCopProjectGenerator gen = new FxCopProjectGenerator();
 
@@ -92,8 +92,8 @@ public void testGenerateCore() throws IOException {
 		  assertThat(Files.exists(Paths.get(binFile.getAbsolutePath()))).isTrue();
 
 		  String resultFileName = gen.generate(TEST_CORE_SLN);
-		  
-		  assertThat(resultFileName).isNotEmpty();
+		  //No .net Core support in the moment
+		  //assertThat(resultFileName).isNotEmpty();
 
 
 	  }
@@ -200,11 +200,12 @@ public void testCoreCsprojDllDebugScan() throws IOException {
 
 		  String file = gen.getDllPathFromCsProj(TEST_CORE_CSPROJ_DLL);
 
-		  assertThat(file).isNotNull();
+		  assertThat(file).isNull();
+		  /* No .Net Core support in the moment
 		  assertThat(file).isNotEmpty();
 		  assertThat(file).endsWith("TestLibCore.dll");
 		  assertThat(file).doesNotContain("/../");
-		  assertThat(file).doesNotContain("\\..\\");
+		  assertThat(file).doesNotContain("\\..\\");*/
 	  }
 
 	  @Test