From f6e309d5212b6632dd745ec9b8ae97ffa2e18024 Mon Sep 17 00:00:00 2001 From: Leonid Efremov Date: Tue, 17 Aug 2021 16:13:20 +0300 Subject: [PATCH] Appveyor CI restore (#39) * net5.0 support --- .gitignore | 3 ++- Directory.Build.props | 2 +- appveyor.yml | 13 ++++++++----- global.json | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index f02d8e1..74e760e 100644 --- a/.gitignore +++ b/.gitignore @@ -197,4 +197,5 @@ ModelManifest.xml *.nunit.xml .packages/ .sonarqube/ -coverage.opencover.xml +coverage.*.opencover.xml + diff --git a/Directory.Build.props b/Directory.Build.props index b9fcaa2..2114bd1 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -8,7 +8,7 @@ $(Version) - 1.3.0 + 1.4.0 $(VersionSuffix) Leonid Efremov diff --git a/appveyor.yml b/appveyor.yml index b257637..9dd1d20 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,15 +11,15 @@ skip_branch_with_pr: true max_jobs: 1 -image: Visual Studio 2019 +image: Ubuntu -shallow_clone: true +shallow_clone: false init: - git config --global core.autocrlf input install: - - dotnet tool install --global dotnet-sonarscanner + - dotnet tool install --global dotnet-sonarscanner --version 5.2.2 - ps: | $content = Get-Content -Path Directory.Build.props $regex = New-Object System.Text.RegularExpressions.Regex ('()([\d]+.[\d]+.[\d]+)(<\/VersionPrefix>)', [System.Text.RegularExpressions.RegexOptions]::MultiLine) @@ -32,6 +32,7 @@ install: configuration: Release before_build: + - ps: $env:JAVA_HOME=$env:JAVA_HOME_15_X64 - ps: 'if (-Not $env:APPVEYOR_PULL_REQUEST_NUMBER) { & dotnet sonarscanner begin /k:"$env:APPVEYOR_PROJECT_NAME" @@ -39,12 +40,14 @@ before_build: /o:"$env:SONAR_ORGANIZATION" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="$env:SONAR_LOGIN" - /d:sonar.cs.opencover.reportsPaths="**\coverage.opencover.xml" + /d:sonar.cs.opencover.reportsPaths="**\coverage.*.opencover.xml" /d:sonar.coverage.exclusions="**Tests*.cs" + /d:sonar.language=csharp + /d:sonar.verbose=false }' build_script: - - dotnet build --configuration %CONFIGURATION% + - dotnet build # --configuration %CONFIGURATION% after_build: - dotnet pack --no-build diff --git a/global.json b/global.json index 12cb7ff..4916896 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "5.0.102" + "version": "5.0.300" } } \ No newline at end of file