Skip to content

Commit 1af5e5d

Browse files
Merge branch 'develop' into mstest4
2 parents a157ad3 + e5ad82c commit 1af5e5d

File tree

2 files changed

+35
-5
lines changed

2 files changed

+35
-5
lines changed

.github/workflows/build.yml

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,8 @@ jobs:
187187
name: Coverlet Results Windows .NET
188188
path: coverlet
189189

190-
Publish:
190+
Publish-GitHub-Package:
191+
name: Publish GitHub Package
191192
runs-on: ubuntu-24.04
192193
if: github.ref == 'refs/heads/develop'
193194
permissions:
@@ -214,3 +215,32 @@ jobs:
214215
dotnet nuget push "*.nupkg" \
215216
--source github \
216217
--api-key ${{ secrets.GITHUB_TOKEN }}
218+
219+
Publish-NuGet-Package:
220+
name: Publish NuGet Package
221+
runs-on: ubuntu-24.04
222+
if: startsWith(github.event.ref, 'refs/tags/20')
223+
permissions:
224+
id-token: write
225+
needs:
226+
- Windows
227+
- Linux
228+
- Windows-Integration-Tests-NetFramework
229+
- Windows-Integration-Tests-Net
230+
steps:
231+
- name: Download NuGet Package
232+
uses: actions/download-artifact@v5
233+
with:
234+
name: NuGet Package
235+
236+
- name: NuGet login (OIDC → temp API key)
237+
uses: NuGet/login@v1
238+
id: login
239+
with:
240+
user: ${{ secrets.NUGET_USER }}
241+
242+
- name: Publish to NuGet Registry
243+
run: |
244+
dotnet nuget push "*.nupkg" \
245+
--source https://api.nuget.org/v3/index.json \
246+
--api-key ${{ steps.login.outputs.NUGET_API_KEY }}

version.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "2025.1.0-prerelease.{height}",
3+
"version": "2025.1.1-prerelease.{height}",
44
"assemblyVersion": {
55
"precision": "revision"
66
},
@@ -12,7 +12,7 @@
1212
"^refs/tags/\\d{4}\\.\\d+\\.\\d+"
1313
],
1414
"release": {
15-
"firstUnstableTag": "prerelease",
16-
"versionIncrement": "build"
15+
"versionIncrement": "build",
16+
"firstUnstableTag": "prerelease"
1717
}
18-
}
18+
}

0 commit comments

Comments
 (0)