Code analysis fixes (#4804)

Author: DavidBoike

.github/workflows/build-windows.yml

@@ -1,5 +1,8 @@
 on:
   workflow_call:
+defaults:
+  run:
+    shell: pwsh
 jobs:
   build:
     if: ${{ github.actor != 'dependabot[bot]' }}
@@ -8,7 +11,6 @@ jobs:
       - name: Check for secrets
         env:
           SECRETS_AVAILABLE: ${{ secrets.SECRETS_AVAILABLE }}
-        shell: pwsh
         run: exit $(If ($env:SECRETS_AVAILABLE -eq 'true') { 0 } Else { 1 })
       - name: Checkout
         uses: actions/[email protected]
@@ -19,7 +21,6 @@ jobs:
         with:
           dotnet-version: 8.0.x
       - name: Download RavenDB Server
-        shell: pwsh
         run: ./tools/download-ravendb-server.ps1
       - name: Build
         run: dotnet build src --configuration Release -graph --property:WindowsSelfContained=true
@@ -47,7 +48,6 @@ jobs:
           assets\Particular.ServiceControl.exe
       - name: Rename ServiceControl Management EXE
         run: Rename-Item -Path assets\Particular.ServiceControl.exe -NewName "Particular.ServiceControl-${{ env.MinVerVersion }}.exe"
-        shell: pwsh
       - name: Sign PowerShell module
         run: |
           AzureSignTool sign `
@@ -80,7 +80,6 @@ jobs:
           Remove-Item deploy\Particular.ServiceControl* -recurse
           dotnet clean src --configuration Release --property:WindowsSelfContained=true
           dotnet build src\Particular.PlatformSample.ServiceControl\Particular.PlatformSample.ServiceControl.csproj --configuration Release -graph
-        shell: pwsh
       - name: Sign NuGet packages
         uses: Particular/[email protected]
         with:
@@ -95,7 +94,6 @@ jobs:
           path: nugets/*
           retention-days: 1
       - name : Verify release artifact counts
-        shell: pwsh
         run: |
           $assetsCount = (Get-ChildItem -Recurse -File assets).Count
           $nugetsCount =  (Get-ChildItem -Recurse -File nugets).Count

.github/workflows/ci.yml

@@ -8,6 +8,9 @@ on:
   workflow_dispatch:
 env:
   DOTNET_NOLOGO: true
+defaults:
+  run:
+    shell: pwsh
 jobs:
   build:
     name: ${{ matrix.os-name }}-${{ matrix.test-category }}
@@ -29,7 +32,6 @@ jobs:
       - name: Check for secrets
         env:
           SECRETS_AVAILABLE: ${{ secrets.SECRETS_AVAILABLE }}
-        shell: pwsh
         run: exit $(If ($env:SECRETS_AVAILABLE -eq 'true') { 0 } Else { 1 })
       - name: Checkout
         uses: actions/[email protected]
@@ -40,12 +42,10 @@ jobs:
         with:
           dotnet-version: 8.0.x
       - name: Download RavenDB Server
-        shell: pwsh
         run: ./tools/download-ravendb-server.ps1
       - name: Build
         run: dotnet build src --configuration Release -graph
       - name: Zip PowerShell module
-        shell: pwsh
         run: |
           New-Item assets\PowerShellModules -ItemType Directory
           Compress-Archive -Path deploy\PowerShellModules\Particular.ServiceControl.Management\* -DestinationPath assets\PowerShellModules\Particular.ServiceControl.Management.zip
@@ -61,7 +61,6 @@ jobs:
           retention-days: 1
       - name: Smoke test PowerShell module import
         if: matrix.os-name == 'Windows'
-        shell: pwsh
         run: Import-Module ./deploy/PowerShellModules/Particular.ServiceControl.Management
       - name: Azure login
         uses: azure/[email protected]
@@ -77,11 +76,11 @@ jobs:
       - name: Setup PostgreSQL
         uses: Particular/[email protected]
         if: matrix.test-category == 'PostgreSQL'
-        with:          
+        with:
           connection-string-name: ServiceControl_TransportTests_PostgreSQL_ConnectionString
           tag: ServiceControl
           registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          registry-password: ${{ secrets.DOCKERHUB_TOKEN }}  
+          registry-password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Setup RabbitMQ
         uses: Particular/[email protected]
         if: matrix.test-category == 'RabbitMQ'
@@ -106,7 +105,6 @@ jobs:
           tag: ServiceControl
       - name: Setup SQS environment variables
         if: matrix.test-category == 'SQS'
-        shell: pwsh
         run: |
           echo "AWS_REGION=${{ secrets.AWS_REGION }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
           echo "AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append

src/ServiceControl.AcceptanceTests.RavenDB/ServiceControl.AcceptanceTests.RavenDB.csproj

@@ -14,14 +14,14 @@
 
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="NServiceBus.SagaAudit" />
     <PackageReference Include="NServiceBus.Heartbeat" />
+    <PackageReference Include="NServiceBus.SagaAudit" />
     <PackageReference Include="NUnit" />
     <PackageReference Include="NUnit.Analyzers" />
     <PackageReference Include="NUnit3TestAdapter" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
   </ItemGroup>
 
   <ItemGroup>

src/ServiceControl.Audit.AcceptanceTests.RavenDB/ServiceControl.Audit.AcceptanceTests.RavenDB.csproj

@@ -14,12 +14,12 @@
 
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="NServiceBus.SagaAudit" />
     <PackageReference Include="NUnit" />
     <PackageReference Include="NUnit.Analyzers" />
     <PackageReference Include="NUnit3TestAdapter" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
   </ItemGroup>
 
   <ItemGroup>

src/ServiceControl.Audit.AcceptanceTests/ServiceControl.Audit.AcceptanceTests.csproj

@@ -14,12 +14,12 @@
 
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="NServiceBus.SagaAudit" />
     <PackageReference Include="NUnit" />
     <PackageReference Include="NUnit.Analyzers" />
     <PackageReference Include="NUnit3TestAdapter" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
   </ItemGroup>
 
 </Project>

src/ServiceControl.Infrastructure/ServiceControl.Infrastructure.csproj

@@ -9,9 +9,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="NLog.Extensions.Logging" />
     <PackageReference Include="NServiceBus" />
     <PackageReference Include="NServiceBus.Extensions.Logging" />
-    <PackageReference Include="NLog.Extensions.Logging" />
   </ItemGroup>
 
 </Project>

src/ServiceControl.Transports.Tests/GlobalSuppressions.cs

@@ -14,13 +14,13 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NServiceBus.AcceptanceTesting" />
+    <PackageReference Include="NServiceBus.Persistence.NonDurable" />
     <PackageReference Include="NUnit" />
     <PackageReference Include="NUnit.Analyzers" />
     <PackageReference Include="NUnit3TestAdapter" />
     <PackageReference Include="Particular.Approvals" />
     <PackageReference Include="PublicApiGenerator" />
-    <PackageReference Include="NServiceBus.AcceptanceTesting" />
-    <PackageReference Include="NServiceBus.Persistence.NonDurable" />
     <PackageReference Include="System.Reflection.MetadataLoadContext" />
   </ItemGroup>
 

src/ServiceControl.Transports.Tests/ServiceControl.Transports.Tests.csproj

@@ -42,8 +42,8 @@
   </Target>
 
   <ItemGroup>
-    <InternalsVisibleTo Include="ServiceControlInstaller.Engine.UnitTests" />
     <InternalsVisibleTo Include="ServiceControl.Config.Tests" />
+    <InternalsVisibleTo Include="ServiceControlInstaller.Engine.UnitTests" />
   </ItemGroup>
 
 </Project>