Updates

frasermolyneux · Nov 11, 2023 · f467cda · f467cda
1 parent df12a43
commit f467cda
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 22 deletions.
diff --git a/.github/workflows/codequality.yml b/.github/workflows/codequality.yml
@@ -13,24 +13,18 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
       with:
-        java-version: 1.11
+        fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
-    - name: Cache SonarCloud packages
-      uses: actions/cache@v1
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
       with:
-        path: ~\sonar\cache
-        key: ${{ runner.os }}-sonar
-        restore-keys: ${{ runner.os }}-sonar
+        java-version: 17
+        distribution: 'zulu' # Alternative distribution options are available.
 
-    - name: Install SonarCloud scanners
+    - name: Install SonarCloud scanner
       shell: bash
-      run: |
-        cd src
-        dotnet tool install --global dotnet-sonarscanner
+      run: dotnet tool install --global dotnet-sonarscanner
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
@@ -44,11 +38,10 @@ jobs:
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       run: |
         cd src
-        dotnet-sonarscanner begin /k:"frasermolyneux_portal-repository" /o:"frasermolyneux" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
-
-    - uses: frasermolyneux/actions/dotnet-web-ci@main
+        dotnet sonarscanner begin /k:"frasermolyneux_portal-repository" /o:"frasermolyneux" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
+        
+    - uses: frasermolyneux/actions/dotnet-ci@main
       with:
-        dotnet-project: "repository-webapi"
         dotnet-version: 7.0.x
         src-folder: "src"
         majorMinorVersion: "1.1"
@@ -60,7 +53,7 @@ jobs:
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       run: |
         cd src
-        dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
+        dotnet sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@
 
 | Stage | Status |
 | --- | --- |
+| Code Quality | [![Code Quality](https://github.com/frasermolyneux/portal-repository/actions/workflows/codequality.yml/badge.svg)](https://github.com/frasermolyneux/portal-repository/actions/workflows/codequality.yml) |
 | Feature Development | [![Feature Development](https://github.com/frasermolyneux/portal-repository/actions/workflows/feature-development.yml/badge.svg?branch=main)](https://github.com/frasermolyneux/portal-repository/actions/workflows/feature-development.yml) |
 | Pull Request Validation | [![Pull Request Validation](https://github.com/frasermolyneux/portal-repository/actions/workflows/pull-request-validation.yml/badge.svg)](https://github.com/frasermolyneux/portal-repository/actions/workflows/pull-request-validation.yml) |
 | Destroy Development | [![Destroy Development](https://github.com/frasermolyneux/portal-repository/actions/workflows/destroy-development.yml/badge.svg)](https://github.com/frasermolyneux/portal-repository/actions/workflows/destroy-development.yml) |

diff --git a/src/repository-webapi-abstractions/repository-webapi-abstractions.csproj b/src/repository-webapi-abstractions/repository-webapi-abstractions.csproj
@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MxIO.ApiClient.Abstractions" Version="1.1.35.1" />
+    <PackageReference Include="MxIO.ApiClient.Abstractions" Version="1.1.45.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 

diff --git a/src/repository-webapi-client/repository-webapi-client.csproj b/src/repository-webapi-client/repository-webapi-client.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
-    <PackageReference Include="MxIO.ApiClient" Version="1.1.39.1" />
+    <PackageReference Include="MxIO.ApiClient" Version="1.1.45.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="RestSharp" Version="110.2.0" />
   </ItemGroup>

diff --git a/src/repository-webapi/repository-webapi.csproj b/src/repository-webapi/repository-webapi.csproj
@@ -14,13 +14,13 @@
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
     <PackageReference Include="Azure.Identity" Version="1.10.3" />
     <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.5.0" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.18.0" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.19.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.13" />
     <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.2" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
     <PackageReference Include="Microsoft.Identity.Web" Version="2.15.3" />
-    <PackageReference Include="MxIO.ApiClient.WebExtensions" Version="1.1.36.1" />
+    <PackageReference Include="MxIO.ApiClient.WebExtensions" Version="1.1.45.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />