Skip to content

Commit 8d6c7eb

Browse files
martincostellomartincostello
committed
Merge branch 'dev' into dev-v9
2 parents 14c9b06 + 0517ddc commit 8d6c7eb

File tree

4 files changed

+40
-20
lines changed

4 files changed

+40
-20
lines changed

‎.github/workflows/build.yml

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ jobs:
2626
outputs:
2727
dotnet-sdk-version: ${{ steps.setup-dotnet.outputs.dotnet-version }}
2828

29+
permissions:
30+
attestations: write
31+
contents: read
32+
id-token: write
33+
2934
strategy:
3035
fail-fast: false
3136
matrix:
@@ -40,10 +45,10 @@ jobs:
4045

4146
steps:
4247
- name: Checkout code
43-
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
48+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
4449

4550
- name: Setup .NET SDK
46-
uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4.0.0
51+
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
4752
id: setup-dotnet
4853

4954
- name: Setup NuGet
@@ -77,21 +82,35 @@ jobs:
7782
if: ${{ runner.os != 'Windows' }}
7883
run: ./eng/common/cibuild.sh -configuration Release -prepareMachine
7984

85+
- name: Attest artifacts
86+
uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
87+
if: |
88+
runner.os == 'Windows' &&
89+
github.event.repository.fork == false &&
90+
(github.ref_name == github.event.repository.default_branch ||
91+
startsWith(github.ref, 'refs/heads/dev') ||
92+
startsWith(github.ref, 'refs/heads/rel/') ||
93+
startsWith(github.ref, 'refs/tags/'))
94+
with:
95+
subject-path: |
96+
./artifacts/bin/AspNet.Security.*/Release/**/AspNet.Security.*.dll
97+
./artifacts/packages/Release/Shipping/*
98+
8099
- name: Publish logs
81-
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
100+
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
82101
if: ${{ always() }}
83102
with:
84103
name: logs-${{ matrix.os_name }}
85104
path: ./artifacts/log/Release
86105

87106
- name: Publish NuGet packages
88-
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
107+
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
89108
with:
90109
name: packages-${{ matrix.os_name }}
91110
path: ./artifacts/packages/Release/Shipping
92111

93112
- name: Publish test results
94-
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
113+
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
95114
if: ${{ always() }}
96115
with:
97116
name: testresults-${{ matrix.os_name }}
@@ -103,12 +122,12 @@ jobs:
103122
steps:
104123

105124
- name: Download packages
106-
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
125+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
107126
with:
108127
name: packages-windows
109128

110129
- name: Setup .NET SDK
111-
uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4.0.0
130+
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
112131
with:
113132
dotnet-version: ${{ needs.build.outputs.dotnet-sdk-version }}
114133

@@ -126,26 +145,27 @@ jobs:
126145
}
127146
if ($invalidPackages -gt 0) {
128147
Write-Output "::error::$invalidPackages NuGet package(s) failed validation."
148+
exit 1
129149
}
130150
131151
publish-myget:
132152
needs: [ build, validate-packages ]
133153
runs-on: ubuntu-latest
134154
if: |
135155
github.event.repository.fork == false &&
136-
(github.ref == format('refs/heads/{0}', github.event.repository.default_branch) ||
156+
(github.ref_name == github.event.repository.default_branch ||
137157
startsWith(github.ref, 'refs/heads/dev') ||
138158
startsWith(github.ref, 'refs/heads/rel/') ||
139159
startsWith(github.ref, 'refs/tags/'))
140160
steps:
141161

142162
- name: Download packages
143-
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
163+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
144164
with:
145165
name: packages-windows
146166

147167
- name: Setup .NET SDK
148-
uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4.0.0
168+
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
149169
with:
150170
dotnet-version: ${{ needs.build.outputs.dotnet-sdk-version }}
151171

@@ -163,12 +183,12 @@ jobs:
163183
steps:
164184

165185
- name: Download packages
166-
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
186+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
167187
with:
168188
name: packages-windows
169189

170190
- name: Setup .NET SDK
171-
uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4.0.0
191+
uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
172192
with:
173193
dotnet-version: ${{ needs.build.outputs.dotnet-sdk-version }}
174194

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ permissions:
2121
jobs:
2222
update-sdk:
2323
name: Update .NET SDK
24-
uses: martincostello/update-dotnet-sdk/.github/workflows/update-dotnet-sdk.yml@68300a9120c745ca0ff120e2940b63ef1ad2c725 # v3.2.2
24+
uses: martincostello/update-dotnet-sdk/.github/workflows/update-dotnet-sdk.yml@67d6e2b14939c06978a7f80444157296c3defe14 # v3.2.3
2525
permissions:
2626
contents: write
2727
pull-requests: write

‎Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
<ItemGroup>
44
<PackageVersion Include="AngleSharp" Version="1.1.2" />
5-
<PackageVersion Include="JetBrains.Annotations" Version="2023.3.0" />
5+
<PackageVersion Include="JetBrains.Annotations" Version="2024.2.0" />
66
<PackageVersion Include="JustEat.HttpClientInterception" Version="4.3.0" />
77
<PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.4.0" />
88
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0-preview.7.24406.2" />
99
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.0-preview.7.24406.2" />
10-
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="7.6.2" />
10+
<PackageVersion Include="Microsoft.IdentityModel.Protocols" Version="8.0.0" />
1111
<PackageVersion Include="Shouldly" Version="4.2.1" />
1212
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
1313
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />

‎README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ See the [/samples](https://github.com/aspnet-contrib/AspNet.Security.OpenId.Prov
3434

3535
**AspNet.Security.OpenId.Providers** is actively maintained by:
3636

37-
* **[Kévin Chalet](https://github.com/kevinchalet)** ([@kevin_chalet](https://twitter.com/kevin_chalet)).
38-
* **[Martin Costello](https://github.com/martincostello)** ([@martin_costello](https://twitter.com/martin_costello)).
37+
- **[Kévin Chalet](https://github.com/kevinchalet)** ([@kevin_chalet](https://twitter.com/kevin_chalet)).
38+
- **[Martin Costello](https://github.com/martincostello)** ([@martin_costello](https://twitter.com/martin_costello)).
3939

4040
We would love it if you could help contributing to this repository.
4141

@@ -62,9 +62,9 @@ If a provider you're looking for does not exist, consider making a PR to add one
6262

6363
| Provider | Stable | Nightly | Documentation |
6464
|:-:|:-:|:-:|:-:|
65-
| OpenId | [![NuGet](https://buildstats.info/nuget/AspNet.Security.OpenId?includePreReleases=false)](https://www.nuget.org/packages/AspNet.Security.OpenId/ "Download AspNet.Security.OpenId from NuGet.org") | [![MyGet](https://buildstats.info/myget/aspnet-contrib/AspNet.Security.OpenId?includePreReleases=true)](https://www.myget.org/feed/aspnet-contrib/package/nuget/AspNet.Security.OpenId "Download AspNet.Security.OpenId from MyGet.org") | N/A |
66-
| Steam | [![NuGet](https://buildstats.info/nuget/AspNet.Security.OpenId.Steam?includePreReleases=false)](https://www.nuget.org/packages/AspNet.Security.OpenId.Steam/ "Download AspNet.Security.OpenId.Steam from NuGet.org") | [![MyGet](https://buildstats.info/myget/aspnet-contrib/AspNet.Security.OpenId.Steam?includePreReleases=true)](https://www.myget.org/feed/aspnet-contrib/package/nuget/AspNet.Security.OpenId.Steam "Download AspNet.Security.OpenId.Steam from MyGet.org") | [Documentation](https://steamcommunity.com/dev "Steam developer documentation") |
65+
| OpenId | [![NuGet](https://img.shields.io/nuget/v/AspNet.Security.OpenId?logo=nuget&label=NuGet&color=blue)](https://www.nuget.org/packages/AspNet.Security.OpenId/ "Download AspNet.Security.OpenId from NuGet.org") | [![MyGet](https://img.shields.io/myget/aspnet-contrib/vpre/AspNet.Security.OpenId?logo=nuget&label=MyGet&color=blue)](https://www.myget.org/feed/aspnet-contrib/package/nuget/AspNet.Security.OpenId "Download AspNet.Security.OpenId from MyGet.org") | N/A |
66+
| Steam | [![NuGet](https://img.shields.io/nuget/v/AspNet.Security.OpenId.Steam?logo=nuget&label=NuGet&color=blue)](https://www.nuget.org/packages/AspNet.Security.OpenId.Steam/ "Download AspNet.Security.OpenId.Steam from NuGet.org") | [![MyGet](https://img.shields.io/myget/aspnet-contrib/vpre/AspNet.Security.OpenId.Steam?logo=nuget&label=MyGet&color=blue)](https://www.myget.org/feed/aspnet-contrib/package/nuget/AspNet.Security.OpenId.Steam "Download AspNet.Security.OpenId.Steam from MyGet.org") | [Documentation](https://steamcommunity.com/dev "Steam developer documentation") |
6767

6868
<!--
69-
| CHANGEME | [![NuGet](https://buildstats.info/nuget/AspNet.Security.OpenId.CHANGEME?includePreReleases=false)](https://www.nuget.org/packages/AspNet.Security.OpenId.CHANGEME/ "Download AspNet.Security.OpenId.CHANGEME from NuGet.org") | [![MyGet](https://buildstats.info/myget/aspnet-contrib/AspNet.Security.OpenId.CHANGEME?includePreReleases=true)](https://www.myget.org/feed/aspnet-contrib/package/nuget/AspNet.Security.OpenId.CHANGEME "Download AspNet.Security.OpenId.CHANGEME from MyGet.org") | [Documentation](CHANGEME "CHANGEME developer documentation") |
69+
| CHANGEME | [![NuGet](https://img.shields.io/nuget/v/AspNet.Security.OpenId.CHANGEME?logo=nuget&label=NuGet&color=blue)](https://www.nuget.org/packages/AspNet.Security.OpenId.CHANGEME/ "Download AspNet.Security.OpenId.CHANGEME from NuGet.org") | [![MyGet](https://img.shields.io/myget/aspnet-contrib/vpre/AspNet.Security.OpenId.CHANGEME?logo=nuget&label=MyGet&color=blue)](https://www.myget.org/feed/aspnet-contrib/package/nuget/AspNet.Security.OpenId.CHANGEME "Download AspNet.Security.OpenId.CHANGEME from MyGet.org") | [Documentation](CHANGEME "CHANGEME developer documentation") |
7070
-->

0 commit comments

Comments
 (0)