diff --git a/Hochbaustatistik/config/Jenkinsfile b/Hochbaustatistik/config/Jenkinsfile index 3482f70..7abe06f 100644 --- a/Hochbaustatistik/config/Jenkinsfile +++ b/Hochbaustatistik/config/Jenkinsfile @@ -13,17 +13,14 @@ pipeline { environment { - dotnet ="C:\\Program Files\\dotnet\\" - scannerHome = "C:\\home\\jenkins\\tools\\hudson.plugins.sonar.MsBuildSQRunnerInstallation\\C_sonar-runner" - token = 'sqa_71202f188aacbe40492ba767cf3e841179d3f41a' - project = 'hochbaustatistik' + dotnet ="C:\\Program Files\\dotnet\\" + } steps { cleanWs() checkout scm - bat "dotnet restore Hochbaustatistik\\Hochbaustatistik.sln" - bat "${scannerHome}\\SonarScanner.MSBuild.exe begin /k:${project} /d:sonar.token=${token} /d:sonar.verbose=true /d:sonar.cs.opencover.reportsPaths=${WORKSPACE}\\coverage.xml" + bat "dotnet restore Hochbaustatistik\\Hochbaustatistik.sln" bat "\"${tool 'MSBuild17'}\" ${WORKSPACE}\\Hochbaustatistik\\Hochbaustatistik.sln /t:Restore /t:Rebuild /p:Configuration=Debug" } } @@ -44,13 +41,15 @@ pipeline stage('SonarQube') { environment - { - scannerHome = "C:\\home\\jenkins\\tools\\hudson.plugins.sonar.MsBuildSQRunnerInstallation\\C_sonar-runner" + { + scannerHome = "C:\\home\\jenkins\\tools\\hudson.plugins.sonar.MsBuildSQRunnerInstallation\\C_sonar-runner" + //token = '5f6fffb1bd335a10f8da70b77701bb73d6cd15cf' token = 'sqa_71202f188aacbe40492ba767cf3e841179d3f41a' - project = 'hochbaustatistik' + project = 'hochbaustatistik' } steps { + bat "${scannerHome}\\SonarScanner.MSBuild.exe begin /k:${project} /d:sonar.token=${token} /d:sonar.verbose=true /d:sonar.cs.opencover.reportsPaths=${WORKSPACE}\\coverage.xml bat "${scannerHome}\\SonarScanner.MSBuild.exe end /d:sonar.token=${token}" } }