Skip to content

Commit c46f3f6

Browse files
authored
Code analysis fixes (#2242)
* Code analysis fixes * Overriding bash default here * Set all shells correctly
1 parent 0aad297 commit c46f3f6

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
workflow_dispatch:
99
env:
1010
DOTNET_NOLOGO: true
11+
defaults:
12+
run:
13+
shell: pwsh
1114
jobs:
1215
build:
1316
name: Windows

.github/workflows/release.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ on:
1111
workflow_dispatch:
1212
env:
1313
DOTNET_NOLOGO: true
14+
defaults:
15+
run:
16+
shell: pwsh
1417
jobs:
1518
windows-standalone:
1619
if: ${{ github.actor != 'dependabot[bot]' }}
@@ -19,7 +22,6 @@ jobs:
1922
- name: Check for secrets
2023
env:
2124
SECRETS_AVAILABLE: ${{ secrets.SECRETS_AVAILABLE }}
22-
shell: pwsh
2325
run: exit $(If ($env:SECRETS_AVAILABLE -eq 'true') { 0 } Else { 1 })
2426
- name: Checkout
2527
uses: actions/[email protected]
@@ -107,12 +109,11 @@ jobs:
107109
name: linux-container
108110
defaults:
109111
run:
110-
shell: bash
112+
shell: pwsh
111113
steps:
112114
- name: Check for secrets
113115
env:
114116
SECRETS_AVAILABLE: ${{ secrets.SECRETS_AVAILABLE }}
115-
shell: pwsh
116117
run: exit $(If ($env:SECRETS_AVAILABLE -eq 'true') { 0 } Else { 1 })
117118
- name: Checkout
118119
uses: actions/[email protected]
@@ -121,7 +122,6 @@ jobs:
121122
- name: Install MinVer CLI
122123
run: dotnet tool install --global minver-cli
123124
- name: Determine version
124-
shell: pwsh
125125
run: |
126126
# Read settings from Custom.Build.props
127127
[xml]$xml = Get-Content ./src/Custom.Build.props
@@ -131,7 +131,7 @@ jobs:
131131
if (-not ($minMajorMinor -and $autoIncrement)) {
132132
throw "Missing MinVer settings in Custom.Build.props"
133133
}
134-
134+
135135
# Execute MinVer
136136
echo "MinVerVersion=$(minver --minimum-major-minor $minMajorMinor --auto-increment $autoIncrement)" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
137137
- name: Validate build version
@@ -142,10 +142,12 @@ jobs:
142142
- name: Set up Docker Buildx
143143
uses: docker/[email protected]
144144
- name: Log in to GitHub container registry
145+
shell: bash
145146
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
146147
- name: Build & inspect image
147148
env:
148149
TAG_NAME: ${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.number) || env.MinVerVersion }}
150+
shell: bash
149151
run: |
150152
docker buildx build --push --tag ghcr.io/particular/servicepulse:${{ env.TAG_NAME }} \
151153
--file src/ServicePulse/Dockerfile \

src/ServicePulse.Host/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/ServicePulse.Host/ServicePulse.Host.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,8 @@
2828
<Content Include="app\js\app.constants.js" CopyToOutputDirectory="PreserveNewest" Condition="Exists('app\js\app.constants.js')" />
2929
</ItemGroup>
3030

31+
<ItemGroup>
32+
<InternalsVisibleTo Include="ServicePulse.Host.Tests" />
33+
</ItemGroup>
34+
3135
</Project>

0 commit comments

Comments
 (0)