Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add .net7.0 and update dependencies #477

Merged
merged 1 commit into from
Apr 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
42 changes: 0 additions & 42 deletions .github/workflows/dotnet-pack-main.yml

This file was deleted.

24 changes: 4 additions & 20 deletions .github/workflows/dotnet-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,8 @@ on:
- next

jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
submodules: true
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.302
- name: Setup dotnet tools
run: dotnet tool restore
- name: Test
run: ./build.sh --target test --no-logo

semantic-release:
runs-on: ubuntu-latest
needs: test
steps:
- uses: actions/checkout@v3
with:
Expand All @@ -33,15 +17,15 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.302
dotnet-version: 7.x
- name: Setup dotnet tools
run: dotnet tool restore
- name: Semantic Release
uses: cycjimmy/semantic-release-action@v3
with:
semantic_version: 19
extra_plugins: |
@semantic-release/exec
semantic-release-net
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NUGET_SOURCE: 'https://api.nuget.org/v3/index.json'
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
NUGET_TOKEN: ${{ secrets.NUGET_API_KEY }}
25 changes: 23 additions & 2 deletions .github/workflows/dotnet-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,37 @@ on:

jobs:
test:
name: Test (.NET ${{ matrix.version }})
runs-on: ubuntu-latest
strategy:
fail-fast: true
matrix:
version:
- 6.x
- 7.x
steps:
- uses: actions/checkout@v3
with:
submodules: true
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.302
dotnet-version: ${{ matrix.version }}
- name: Setup dotnet tools
run: dotnet tool restore
- name: Test
run: ./build.sh --target test --no-logo
run: dotnet test --configuration Release

result:
if: ${{ always() }}
runs-on: ubuntu-latest
name: Results
needs: [ test ]
steps:
- run: |
result="${{ needs.test.result }}"
if [[ $result == "success" || $result == "skipped" ]]; then
exit 0
else
exit 1
fi
6 changes: 2 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@
*.userosscache
*.sln.docstates

# Ci things
# CI things
tools/
nuget/
artifacts/
coverage/
.tmp/
.nuke/temp
.nuke/build.schema.json
build/

# Build results
[Dd]ebug/
Expand Down
4 changes: 0 additions & 4 deletions .nuke/parameters.json

This file was deleted.

22 changes: 6 additions & 16 deletions .releaserc.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,15 @@
"prerelease": "prerelease"
}
],
"plugins": ["@semantic-release/commit-analyzer", "@semantic-release/release-notes-generator", "@semantic-release/github"],
"prepare": [
[
"@semantic-release/exec",
{
"prepareCmd": "./build.sh --no-logo --version ${nextRelease.version} --release-notes '${nextRelease.notes}' --target Pack"
}
]
],
"publish": [
[
"@semantic-release/exec",
{
"publishCmd": "./build.sh --no-logo --target Publish --source-env NUGET_SOURCE --api-key-env NUGET_API_KEY"
}
],
"plugins": [
"@semantic-release/commit-analyzer",
"@semantic-release/release-notes-generator",
"semantic-release-net",
[
"@semantic-release/github",
{
"successComment": false,
"failComment": false,
"assets": [
{
"path": "artifacts/*.nupkg"
Expand Down
7 changes: 0 additions & 7 deletions Zitadel.sln
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@

Microsoft Visual Studio Solution File, Format Version 12.00
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E41E944E-1B83-4AA3-8DC5-1D8AFD387AE8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2462186B-61A8-476C-9674-176570BBEC35}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{47CEB49C-56A9-4BDF-BC66-54E407391D49}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zitadel", "src\Zitadel\Zitadel.csproj", "{F6769E50-6690-4E96-8DD7-EA4EB4CDA91C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "build\_build.csproj", "{BF13C638-6A5C-4BF6-89FF-1BAA3986F86A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "solution", "solution", "{4533ABEB-FB66-4EF8-95D5-FD7F624A95EB}"
ProjectSection(SolutionItems) = preProject
LICENSE = LICENSE
Expand Down Expand Up @@ -47,16 +43,13 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{F6769E50-6690-4E96-8DD7-EA4EB4CDA91C} = {47CEB49C-56A9-4BDF-BC66-54E407391D49}
{BF13C638-6A5C-4BF6-89FF-1BAA3986F86A} = {E41E944E-1B83-4AA3-8DC5-1D8AFD387AE8}
{44543DC1-97C5-4525-8EE4-16E5389FDF4E} = {2462186B-61A8-476C-9674-176570BBEC35}
{78335CF5-C1F0-47D4-A8D1-17FC808FAF50} = {47CEB49C-56A9-4BDF-BC66-54E407391D49}
{17758FFE-92C6-42D0-917B-EDF11F64BBAA} = {F64814BA-005A-42D8-953C-676D9F814408}
{5D1B3EA7-ED4F-401C-9362-D825A074CA50} = {F64814BA-005A-42D8-953C-676D9F814408}
{48F68486-4E14-417E-B75D-DECF1ED576A5} = {F64814BA-005A-42D8-953C-676D9F814408}
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{BF13C638-6A5C-4BF6-89FF-1BAA3986F86A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BF13C638-6A5C-4BF6-89FF-1BAA3986F86A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F6769E50-6690-4E96-8DD7-EA4EB4CDA91C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F6769E50-6690-4E96-8DD7-EA4EB4CDA91C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F6769E50-6690-4E96-8DD7-EA4EB4CDA91C}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
7 changes: 0 additions & 7 deletions build.cmd

This file was deleted.

69 changes: 0 additions & 69 deletions build.ps1

This file was deleted.

62 changes: 0 additions & 62 deletions build.sh

This file was deleted.

11 changes: 0 additions & 11 deletions build/.editorconfig

This file was deleted.