From 8d4339f4b0de960c04600d1ec80afe7c65f66176 Mon Sep 17 00:00:00 2001 From: Craig Fowler Date: Sat, 27 Feb 2021 13:58:06 +0000 Subject: [PATCH] Revert "Merge branch 'feature/665-SonarCloud-integration' into feature/elsa-2.0" This reverts commit 3dc1b79b3b51b36936534d02e6cac78f49937442, reversing changes made to 1dbafd8ba21636dd6090b5a8c3febbe0c6b73643. The previous merge of work on #665 broke the build so this commit reverts it back out. --- .SonarQube.Analysis.xml | 9 ----- appveyor.yml | 37 +------------------ .../Elsa.ComponentTests.csproj | 1 - .../Elsa.Core.IntegrationTests.csproj | 1 - .../unit/Elsa.UnitTests/Elsa.UnitTests.csproj | 1 - 5 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 .SonarQube.Analysis.xml diff --git a/.SonarQube.Analysis.xml b/.SonarQube.Analysis.xml deleted file mode 100644 index 922f693d6..000000000 --- a/.SonarQube.Analysis.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - **/*Exception.cs, - src/samples/**/* - - \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 444415fc6..fb1b04e7d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,16 +2,6 @@ image: Previous Visual Studio 2019 environment: nodejs_version: "11" - # AppVeyor installs Java on its build agents by default, but it - # picks an old version that's not compatible with SonarQube. - # This brings it up to date. - JAVA_HOME: "C:\\Program Files\\Java\\jdk13" - sonarcloud_org_name: elsa-workflows - sonarcloud_project_name: elsa-core - sonarcloud_api_key: - secure: qaE9kOVkGGFM7ZMf3YeliZxDU9udTCy6W5xXHJ9T+tXv5qXPMYlIdR7hyNgxW04A - sample_variable: - secure: MrPipn2VVHXu68PxZWztGA== version: 2.0.0-preview6.{build} @@ -45,22 +35,6 @@ install: cd ..\..\..\..\ - dotnet tool install --global dotnet-sonarscanner - -before_build: - - cmd: echo "The sample variable is %sample_variable%" - - cmd: >- - dotnet-sonarscanner begin - /k:%sonarcloud_project_name% - /v:AppVeyor_build_%version% - /o:%sonarcloud_org_name% - /s:%APPVEYOR_BUILD_FOLDER%\.SonarQube.Analysis.xml - /d:sonar.host.url="https://sonarcloud.io" - /d:sonar.login=%sonarcloud_api_key% - /d:sonar.cs.xunit.reportsPaths=%APPVEYOR_BUILD_FOLDER%\**\TestResults\TestResults.xml - /d:sonar.cs.opencover.reportsPaths=%APPVEYOR_BUILD_FOLDER%\**\TestResults\*\coverage.opencover.xml - /d:sonar.branch.name=%APPVEYOR_REPO_BRANCH% - build_script: - ps: >- cd .\src\dashboards\blazor\ElsaDashboard.Application @@ -69,21 +43,14 @@ build_script: cd ..\..\..\..\ - dotnet build + dotnet pack Elsa.sln --include-symbols /p:Version=$env:APPVEYOR_BUILD_VERSION test_script: - - ps: dotnet test --collect:"XPlat Code Coverage" --logger:xunit -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover - -after_test: - - cmd: dotnet-sonarscanner end /d:sonar.login=%sonarcloud_api_key% - -before_package: - - ps: dotnet pack Elsa.sln --include-symbols /p:Version="$env:APPVEYOR_BUILD_VERSION" + - ps: dotnet test artifacts: - path: '**/*.nupkg' name: Packages - - path: '**/TestResults/TestResults.xml' deploy: # Deploy to MyGet on every build (in the appropriate branch) diff --git a/test/component/Elsa.ComponentTests/Elsa.ComponentTests.csproj b/test/component/Elsa.ComponentTests/Elsa.ComponentTests.csproj index 10119e4be..88a6f4ef3 100644 --- a/test/component/Elsa.ComponentTests/Elsa.ComponentTests.csproj +++ b/test/component/Elsa.ComponentTests/Elsa.ComponentTests.csproj @@ -11,7 +11,6 @@ - runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/integration/Elsa.Core.IntegrationTests/Elsa.Core.IntegrationTests.csproj b/test/integration/Elsa.Core.IntegrationTests/Elsa.Core.IntegrationTests.csproj index b1e1a6aa2..c9a1d3c0a 100644 --- a/test/integration/Elsa.Core.IntegrationTests/Elsa.Core.IntegrationTests.csproj +++ b/test/integration/Elsa.Core.IntegrationTests/Elsa.Core.IntegrationTests.csproj @@ -14,7 +14,6 @@ - all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/unit/Elsa.UnitTests/Elsa.UnitTests.csproj b/test/unit/Elsa.UnitTests/Elsa.UnitTests.csproj index ff0b75766..68d5d38b9 100644 --- a/test/unit/Elsa.UnitTests/Elsa.UnitTests.csproj +++ b/test/unit/Elsa.UnitTests/Elsa.UnitTests.csproj @@ -13,7 +13,6 @@ - runtime; build; native; contentfiles; analyzers; buildtransitive all