diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 5b63b05f..9639471d 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -4,10 +4,10 @@ on: push: branches: - main - paths-ignore: ['**.md', '.vscode/**', '**.svg'] + paths-ignore: ["**.md", ".vscode/**", "**.svg"] pull_request: types: [opened, synchronize, reopened] - paths-ignore: ['**.md', '.vscode/**', '**.svg'] + paths-ignore: ["**.md", ".vscode/**", "**.svg"] env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} @@ -22,7 +22,7 @@ jobs: - name: Check whether unity activation requests should be done id: checksecret_job run: | - echo "is_SONAR_TOKEN_set=${{ env.SONAR_TOKEN != '' }}" >> $GITHUB_OUTPUT + echo "is_SONAR_TOKEN_set=${{ env.SONAR_TOKEN != '' }}" >> $GITHUB_OUTPUT build: needs: [checksecret] if: needs.checksecret.outputs.is_SONAR_TOKEN_set == 'true' @@ -32,19 +32,15 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v4 with: - distribution: 'adopt' + distribution: "adopt" java-version: 17 - - name: Setup .NET 5 # At the moment the scanner requires dotnet 5 https://www.nuget.org/packages/dotnet-sonarscanner - uses: actions/setup-dotnet@v4 - with: - dotnet-version: 5.0.x - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 7.0.x + dotnet-version: 9.x - uses: actions/checkout@v4 with: - fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis + fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Cache SonarCloud packages uses: actions/cache@v4 with: @@ -55,9 +51,9 @@ jobs: run: dotnet tool install dotnet-sonarscanner --create-manifest-if-needed - name: Build and analyze env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any CollectCoverage: true - CoverletOutputFormat: 'opencover' # https://github.com/microsoft/vstest/issues/4014#issuecomment-1307913682 + CoverletOutputFormat: "opencover" # https://github.com/microsoft/vstest/issues/4014#issuecomment-1307913682 shell: pwsh run: | dotnet tool run dotnet-sonarscanner begin /k:"microsoftgraph_msgraph-cli-core" /o:"microsoftgraph2" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="**/*.Tests/**/coverage.opencover.xml" /d:sonar.coverage.exclusions="src/sample/**" diff --git a/src/Microsoft.Graph.Cli.Core/Microsoft.Graph.Cli.Core.csproj b/src/Microsoft.Graph.Cli.Core/Microsoft.Graph.Cli.Core.csproj index 4a2a0326..6f5147c1 100644 --- a/src/Microsoft.Graph.Cli.Core/Microsoft.Graph.Cli.Core.csproj +++ b/src/Microsoft.Graph.Cli.Core/Microsoft.Graph.Cli.Core.csproj @@ -47,26 +47,26 @@ OS_WINDOWS - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - + diff --git a/src/sample/sample.csproj b/src/sample/sample.csproj index d6cabf6a..93aed14c 100644 --- a/src/sample/sample.csproj +++ b/src/sample/sample.csproj @@ -9,9 +9,9 @@ - - - + + +