OpenCover#598 update to use new cxx build runner that does not expose…

… credentials and can cope with empty password i.e. uses tokens

default.build

@@ -83,39 +83,18 @@
       commandline='--form token=${coverity.token} --insecure --form email=${coverity.email} --form file=@coverity.zip --form version="${ci.fullBuildNumber}" --form description="${ci.fullBuildNumber}" https://scan.coverity.com/builds?project=OpenCover%2Fopencover' />
 
   </target>
-
-  <target name="sonarqube-build-ci" if="${environment::variable-exists('SONARQUBE_TOKEN')}">
-    <property name="sonarqube.token" value="${environment::get-variable('SONARQUBE_TOKEN')}" />
-
-    <!--
-    <xmlpoke file="tools\sonarqube\runner\SonarQube.Analysis.xml" xpath="//m:Property[@Name='sonar.login']" value="${sonarqube.token}">
-      <namespaces>
-        <namespace prefix="m" uri="http://www.sonarsource.com/msbuild/integration/2015/1" />
-      </namespaces>
-    </xmlpoke>
-
-    <xmlpoke file="tools\sonarqube\runner\SonarQube.Analysis.xml" xpath="//m:Property[@Name='sonar.host.url']" value="https://nemo.sonarqube.org">
-      <namespaces>
-        <namespace prefix="m" uri="http://www.sonarsource.com/msbuild/integration/2015/1" />
-      </namespaces>
-    </xmlpoke>
-    -->
 
-  </target>
-
   <target name="reset-private-vars" >
 
-    <setenv name="SONARQUBE_USER" value="" />
-    <setenv name="SONARQUBE_PASSWORD" value="" />
-
+    <setenv name="SONARQUBE_TOKEN" value="" />
     <setenv name="COVERITY_TOKEN" value="" />
     <setenv name="COVERALLS_REPO_TOKEN" value="" />
 
   </target>
 
   <target name="sonarqube-build" if="${environment::variable-exists('SONARQUBE_TOKEN')}">
 
-    <call target="sonarqube-build-ci" />
+    <property name="sonarqube.token" value="${environment::get-variable('SONARQUBE_TOKEN')}" />
 
     <call target="dogfood-release" />
 
@@ -127,13 +106,9 @@
 			<arg value="tools\CxxSonarQubeMsbuidRunner.zip" />
 		</exec>
 
-    <!--
-    <copy file="tools\CxxSonarQubeMsbuidRunner.exe" tofile="tools\sonarqube\cxx-runner\CxxSonarQubeMsbuidRunner.exe" />
-    -->
-
     <!-- assumes coverage file has been created -->
-    <exec program="tools\sonarqube\cxx-runner\CxxSonarQubeMsbuidRunner.exe" commandline='/m:main\opencover.sln /d:sonar.token=${sonarqube.token} /d:sonar.host.url=https://nemo.sonarqube.org /x:vs15 /q:tools\sonarqube\runner\MSBuild.SonarQube.Runner.exe /n:opencover /k:opencover /p:Configuration=release,Platform=x64,GtestRunnerTaskEnabled=false /v:"${ci.fullBuildNumber}" /d:sonar.cs.opencover.reportsPaths="${root.folder}\main\bin\release\opencovertests.xml"' />
-
+    <exec program="tools\sonarqube\cxx-runner\CxxSonarQubeMsbuidRunner.exe" commandline='/m:main\opencover.sln /d:sonar.token=${sonarqube.token} /d:sonar.host.url=https://nemo.sonarqube.org /d:sonar.cfamily.build-wrapper-output.bypass=true /x:vs15 /q:tools\sonarqube\runner\MSBuild.SonarQube.Runner.exe /n:opencover /k:opencover /p:Configuration=release,Platform=x64,GtestRunnerTaskEnabled=false /v:"${ci.fullBuildNumber}" /d:sonar.cs.opencover.reportsPaths="${root.folder}\main\bin\release\opencovertests.xml"' />
+        
   </target>
 
   <target name="quick-build-release" depends="clean, build-environment, build-release-platforms, test, test-cpp" />