Skip to content

Commit 46bfe8a

Browse files
martincostellomartincostello
committed
Merge branch 'dev' into dev-v9
2 parents 07e0691 + c9e1156 commit 46bfe8a

File tree

4 files changed

+93
-16
lines changed

4 files changed

+93
-16
lines changed

‎.github/dependabot.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
time: "06:30"
8+
timezone: Europe/London
9+
- package-ecosystem: nuget
10+
directory: "/"
11+
schedule:
12+
interval: daily
13+
time: "06:30"
14+
timezone: Europe/London
15+
open-pull-requests-limit: 99
16+
ignore:
17+
- dependency-name: "AngleSharp"
18+
- dependency-name: "Microsoft.AspNetCore.Mvc.Testing"
19+
update-types: ["version-update:semver-major"]
20+
- dependency-name: "Microsoft.AspNetCore.TestHost"
21+
update-types: ["version-update:semver-major"]
22+
- dependency-name: "Microsoft.IdentityModel.Protocols"
23+
- dependency-name: "Microsoft.DotNet.Arcade.Sdk"
24+
- dependency-name: "Microsoft.DotNet.Helix.Sdk"

‎.github/workflows/build.yml

+32-15
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ jobs:
2323
name: ${{ matrix.os }}
2424
runs-on: ${{ matrix.os }}
2525

26+
outputs:
27+
dotnet-sdk-version: ${{ steps.setup-dotnet.outputs.dotnet-version }}
28+
2629
strategy:
2730
fail-fast: false
2831
matrix:
@@ -37,10 +40,14 @@ jobs:
3740

3841
steps:
3942
- name: Checkout code
40-
uses: actions/checkout@v3
43+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
44+
45+
- name: Setup .NET SDK
46+
uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4.0.0
47+
id: setup-dotnet
4148

4249
- name: Setup NuGet
43-
uses: nuget/setup-nuget@v1
50+
uses: nuget/setup-nuget@a21f25cd3998bf370fde17e3f1b4c12c175172f9 # v2.0.0
4451
with:
4552
nuget-version: '5.11.0'
4653

@@ -71,20 +78,20 @@ jobs:
7178
run: ./eng/common/cibuild.sh -configuration Release -prepareMachine
7279

7380
- name: Publish logs
74-
uses: actions/upload-artifact@v3
81+
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
7582
if: ${{ always() }}
7683
with:
7784
name: logs-${{ matrix.os_name }}
7885
path: ./artifacts/log/Release
7986

8087
- name: Publish NuGet packages
81-
uses: actions/upload-artifact@v3
88+
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
8289
with:
8390
name: packages-${{ matrix.os_name }}
8491
path: ./artifacts/packages/Release/Shipping
8592

8693
- name: Publish test results
87-
uses: actions/upload-artifact@v3
94+
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
8895
if: ${{ always() }}
8996
with:
9097
name: testresults-${{ matrix.os_name }}
@@ -96,12 +103,14 @@ jobs:
96103
steps:
97104

98105
- name: Download packages
99-
uses: actions/download-artifact@v3
106+
uses: actions/download-artifact@87c55149d96e628cc2ef7e6fc2aab372015aec85 # v4.1.3
100107
with:
101108
name: packages-windows
102109

103110
- name: Setup .NET SDK
104-
uses: actions/setup-dotnet@v3
111+
uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4.0.0
112+
with:
113+
dotnet-version: ${{ needs.build.outputs.dotnet-sdk-version }}
105114

106115
- name: Validate NuGet packages
107116
shell: pwsh
@@ -120,7 +129,7 @@ jobs:
120129
}
121130
122131
publish-myget:
123-
needs: validate-packages
132+
needs: [ build, validate-packages ]
124133
runs-on: ubuntu-latest
125134
if: |
126135
github.event.repository.fork == false &&
@@ -131,31 +140,39 @@ jobs:
131140
steps:
132141

133142
- name: Download packages
134-
uses: actions/download-artifact@v3
143+
uses: actions/download-artifact@87c55149d96e628cc2ef7e6fc2aab372015aec85 # v4.1.3
135144
with:
136145
name: packages-windows
137146

138147
- name: Setup .NET SDK
139-
uses: actions/setup-dotnet@v3
148+
uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4.0.0
149+
with:
150+
dotnet-version: ${{ needs.build.outputs.dotnet-sdk-version }}
140151

141152
- name: Push NuGet packages to aspnet-contrib MyGet
142-
run: nuget push "*.nupkg" -ApiKey ${{ secrets.MYGET_API_KEY }} -SkipDuplicate -Source https://www.myget.org/F/aspnet-contrib/api/v3/index.json
153+
env:
154+
MYGET_API_KEY: ${{ secrets.MYGET_API_KEY }}
155+
run: nuget push "*.nupkg" -ApiKey "${MYGET_API_KEY}" -SkipDuplicate -Source https://www.myget.org/F/aspnet-contrib/api/v3/index.json
143156

144157
publish-nuget:
145-
needs: validate-packages
158+
needs: [ build, validate-packages ]
146159
runs-on: ubuntu-latest
147160
if: |
148161
github.event.repository.fork == false &&
149162
startsWith(github.ref, 'refs/tags/')
150163
steps:
151164

152165
- name: Download packages
153-
uses: actions/download-artifact@v3
166+
uses: actions/download-artifact@87c55149d96e628cc2ef7e6fc2aab372015aec85 # v4.1.3
154167
with:
155168
name: packages-windows
156169

157170
- name: Setup .NET SDK
158-
uses: actions/setup-dotnet@v3
171+
uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4.0.0
172+
with:
173+
dotnet-version: ${{ needs.build.outputs.dotnet-sdk-version }}
159174

160175
- name: Push NuGet packages to NuGet.org
161-
run: nuget push "*.nupkg" -ApiKey ${{ secrets.NUGET_API_KEY }} -SkipDuplicate -Source https://api.nuget.org/v3/index.json
176+
env:
177+
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
178+
run: nuget push "*.nupkg" -ApiKey "${NUGET_API_KEY}" -SkipDuplicate -Source https://api.nuget.org/v3/index.json

‎.github/workflows/update-dotnet-sdk.yml

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: update-dotnet-sdk
2+
3+
on:
4+
schedule:
5+
- cron: '00 19 * * TUE'
6+
workflow_dispatch:
7+
inputs:
8+
branch:
9+
description: 'The branch to run the SDK updates for.'
10+
required: false
11+
type: choice
12+
options:
13+
- 'dev'
14+
- 'dev-v9'
15+
default: 'dev'
16+
17+
permissions:
18+
contents: read
19+
pull-requests: read
20+
21+
jobs:
22+
update-sdk:
23+
name: Update .NET SDK
24+
uses: martincostello/update-dotnet-sdk/.github/workflows/update-dotnet-sdk.yml@9d42ad9bcbd97a74394c7273c9c616b4bf136b53 # v3.1.3
25+
permissions:
26+
contents: write
27+
pull-requests: write
28+
with:
29+
labels: 'dependencies,.NET'
30+
ref: ${{ inputs.branch || 'dev' }}
31+
update-nuget-packages: true
32+
user-email: ${{ vars.SERVICE_ACCOUNT_GIT_EMAIL }}
33+
user-name: ${{ vars.SERVICE_ACCOUNT_GIT_NAME }}
34+
secrets:
35+
application-id: ${{ secrets.SERVICE_ACCOUNT_ID }}
36+
application-private-key: ${{ secrets.SERVICE_ACCOUNT_PRIVATE_KEY }}

‎Directory.Packages.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ItemGroup>
44
<PackageVersion Include="AngleSharp" Version="1.0.6" />
55
<PackageVersion Include="JetBrains.Annotations" Version="2023.3.0" />
6-
<PackageVersion Include="JustEat.HttpClientInterception" Version="4.0.0" />
6+
<PackageVersion Include="JustEat.HttpClientInterception" Version="4.2.0" />
77
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.3.0" />
88
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-preview.1.24081.5" />
99
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.0-preview.1.24081.5" />

0 commit comments

Comments
 (0)