Skip to content

Commit a9b1561

Browse files
aaronpowellaaronpowell
authored
Merge pull request #41 from CommunityToolkit/dotnet-foundation
dotnet foundation
2 parents 3288ee9 + a78bf3e commit a9b1561

File tree

6 files changed

+86
-29
lines changed

6 files changed

+86
-29
lines changed

‎.github/workflows/SignClientFileList.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
**/Aspire.CommunityToolkit.*

‎.github/workflows/dotnet-release.yml

Lines changed: 55 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ on:
99
- "examples/**"
1010
- "tests/**"
1111

12+
env:
13+
DEFAULT_DOTNET_VERSION: "8.0.x"
14+
1215
jobs:
1316
build:
1417
strategy:
@@ -29,7 +32,7 @@ jobs:
2932
uses: actions/setup-dotnet@v4
3033
with:
3134
dotnet-version: |
32-
8.0.x
35+
${{ env.DEFAULT_DOTNET_VERSION }}
3336
9.0.x
3437
- uses: actions/setup-java@v4
3538
name: Set up Java
@@ -138,30 +141,77 @@ jobs:
138141
files: |
139142
./*.nupkg
140143
141-
publish-nuget:
144+
sign:
142145
needs: release
146+
runs-on: windows-latest
147+
permissions:
148+
id-token: write # Required for requesting the JWT
149+
150+
steps:
151+
- name: Install .NET SDK v${{ env.DEFAULT_DOTNET_VERSION }}
152+
uses: actions/setup-dotnet@v4
153+
with:
154+
dotnet-version: ${{ env.DEFAULT_DOTNET_VERSION }}
155+
156+
- name: Download Package List
157+
uses: actions/download-artifact@v4
158+
with:
159+
name: nuget-packages
160+
path: ./
161+
162+
- name: Install Signing Tool
163+
run: dotnet tool install --tool-path ./tools sign --version 0.9.1-beta.23356.1
164+
165+
- name: Sign Packages
166+
run: >
167+
./tools/sign code azure-key-vault
168+
**/*.nupkg
169+
--base-directory "${{ github.workspace }}/packages"
170+
--file-list "${{ github.workspace }}/SignClientFileList.txt"
171+
--timestamp-url "http://timestamp.digicert.com"
172+
--publisher-name ".NET Foundation"
173+
--description ".NET Aspire Community Toolkit"
174+
--description-url "https://github.com/CommunityToolkit/Aspire"
175+
--azure-key-vault-url "${{ secrets.SIGN_KEY_VAULT_URL }}"
176+
--azure-key-vault-client-id ${{ secrets.SIGN_CLIENT_ID }}
177+
--azure-key-vault-client-secret "${{ secrets.SIGN_CLIENT_SECRET }}"
178+
--azure-key-vault-tenant-id ${{ secrets.SIGN_TENANT_ID }}
179+
--azure-key-vault-certificate "${{ secrets.SIGN_CERTIFICATE }}"
180+
--verbosity Information
181+
182+
- name: Upload Signed Packages as Artifacts (for release)
183+
uses: actions/upload-artifact@v4
184+
with:
185+
name: signed-nuget-packages
186+
if-no-files-found: error
187+
path: |
188+
${{ github.workspace }}/packages/**/*.nupkg
189+
190+
publish-nuget:
191+
needs: sign
143192
runs-on: ubuntu-latest
144193
environment:
145194
name: nuget-stable
146195
steps:
147196
- name: Download package
148197
uses: actions/download-artifact@v4
149198
with:
150-
name: nuget-packages
199+
name: signed-nuget-packages
151200

152201
- name: Publish to NuGet
153202
run: dotnet nuget push ./*.nupkg --source "https://api.nuget.org/v3/index.json" --api-key ${{ secrets.NUGET_API_KEY }}
154203

155204
publish-github-packages:
156-
needs: release
205+
needs: sign
157206
runs-on: ubuntu-latest
158207
environment:
159208
name: github-packages
160209
steps:
161210
- name: Download package
162211
uses: actions/download-artifact@v4
163212
with:
164-
name: nuget-packages
213+
name: signed-nuget-packages
165214

166215
- name: Publish to GitHub packages
167216
run: dotnet nuget push ./*.nupkg --source "https://nuget.pkg.github.com/communitytoolkit/index.json" --api-key ${{ secrets.GITHUB_TOKEN }}
217+

‎CONTRIBUTING.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,13 @@ Anyone can create a Pull Request by forking the .NET Aspire Community Toolkit Re
3838
## 💙 Thank You
3939

4040
**Thank you so much for contributing to this amazing project. We hope you will continue to add value and find yourself as a highly reliable source to the .NET Aspire Community Toolkit.**
41+
42+
## Code of Conduct
43+
44+
Please see our [Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
45+
46+
As should be clear by now: we assume everyone tries to do their best, everyone should be treated with respect and equally.
47+
48+
In the unfortunate event that doesn't happen, please feel free to report it to any of the team members or reach out to [Gerald](mailto:gerald.versluis@microsoft.com) directly.
49+
50+
We will take appropriate actions and measures if necessary.

‎LICENSE

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,7 @@
1-
MIT License
1+
The MIT License (MIT)
2+
Copyright (c) .NET Foundation and Contributors
3+
All Rights Reserved
24

3-
Copyright (c) 2024 Contributors
4-
5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
11-
12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
14-
15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
5+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
6+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
7+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎README.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[<img src="https://raw.githubusercontent.com/dotnet-foundation/swag/master/logo/dotnetfoundation_v4.svg" alt=".NET Foundation" width=100>](https://dotnetfoundation.org)
2+
13
# .NET Aspire Community Toolkit
24

35
[![CI](https://github.com/CommunityToolkit/Aspire/actions/workflows/dotnet-ci.yml/badge.svg)](https://github.com/CommunityToolkit/Aspire/actions/workflows/dotnet-ci.yml) | [![main branch](https://github.com/CommunityToolkit/Aspire/actions/workflows/dotnet-main.yml/badge.svg)](https://github.com/CommunityToolkit/Aspire/actions/workflows/dotnet-main.yml) | [![Latest Release](https://github.com/CommunityToolkit/Aspire/actions/workflows/dotnet-release.yml/badge.svg)](https://github.com/CommunityToolkit/Aspire/actions/workflows/dotnet-release.yml)
@@ -37,6 +39,14 @@ Check out our [Contributing guide](./CONTRIBUTING.md) to learn more about contri
3739

3840
Made with [contrib.rocks](https://contrib.rocks).
3941

42+
## Code of Conduct
43+
44+
As a part of the .NET Foundation, we have adopted the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct). Please familiarize yourself with that before participating with this repository. Thanks!
45+
46+
## .NET Foundation
47+
48+
This project is supported by the [.NET Foundation](https://dotnetfoundation.org).
49+
4050
[swa-integration-docs]: https://communitytoolkit.github.io/aspire/integrations/hosting-azure-static-web-apps
4151
[swa-shields]: https://img.shields.io/nuget/v/Aspire.CommunityToolkit.Hosting.Azure.StaticWebApps
4252
[swa-nuget]: https://nuget.org/packages/Aspire.CommunityToolkit.Hosting.Azure.StaticWebApps/
@@ -57,4 +67,3 @@ Made with [contrib.rocks](https://contrib.rocks).
5767
[ollama-nuget]: https://nuget.org/packages/Aspire.CommunityToolkit.Hosting.Ollama/
5868
[ollama-shields-preview]: https://img.shields.io/nuget/v/Aspire.CommunityToolkit.Hosting.Ollama?label=nuget%20(preview)
5969
[ollama-nuget-preview]: https://nuget.org/packages/Aspire.CommunityToolkit.Hosting.Ollama/absoluteLatest
60-

‎src/Directory.Build.props

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@
44
<PropertyGroup>
55
<IsPackable>true</IsPackable>
66

7-
<Authors>Microsoft</Authors>
8-
<Owners>Microsoft</Owners>
7+
<Authors>Microsoft.Toolkit,dotnetfoundation,Community Toolkit</Authors>
8+
<Company>.NET Foundation</Company>
9+
<Copyright>(c) .NET Foundation and Contributors. All rights reserved.</Copyright>
910
<NeutralLanguage>en</NeutralLanguage>
1011
<Product>Aspire.CommunityToolkit ($(NetVersion))</Product>
11-
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
1212
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1313
<PackageProjectUrl>https://github.com/CommunityToolkit/Aspire</PackageProjectUrl>
1414
<PackageIcon>nuget.png</PackageIcon>
1515
<RepositoryUrl>https://github.com/CommunityToolkit/Aspire</RepositoryUrl>
1616
<VersionPrefix>$(AspireVersion).0</VersionPrefix>
17+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
1718

1819
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1920
<EmbedUntrackedSources>true</EmbedUntrackedSources>

0 commit comments

Comments
 (0)