Skip to content

Commit

Permalink
Update supported version to 6 and 8 (#9)
Browse files Browse the repository at this point in the history
* Update supported version to 6 and 8

* global

---------

Co-authored-by: Omer Cohen <omer@descope.com>
  • Loading branch information
itaihanski and omercnet authored Mar 4, 2024
1 parent 590680c commit c0a4799
Show file tree
Hide file tree
Showing 9 changed files with 1,312 additions and 17 deletions.
14 changes: 4 additions & 10 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,11 @@ jobs:
actions: read
checks: write
runs-on: ubuntu-latest
strategy:
max-parallel: 1
matrix:
dotnet-version: ["6.x", "5.x"]

steps:
- uses: actions/checkout@v4
- name: Setup dotnet
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ matrix.dotnet-version }}
- name: Install dependencies
run: dotnet restore --locked-mode
- name: Build with dotnet
Expand All @@ -35,18 +29,18 @@ jobs:
env:
AppSettings__ProjectId: ${{ secrets.DOT_NET_PROJECT_ID }}
AppSettings__ManagementKey: ${{ secrets.DOT_NET_MANAGEMENT_KEY_ID }}
run: dotnet test --no-build --configuration Release --logger trx --results-directory "TestResults-${{ matrix.dotnet-version }}" --blame --blame-hang --blame-hang-timeout 1min --diag "TestResults-${{ matrix.dotnet-version }}/vstest_diagnostics.log"
run: dotnet test --no-build --configuration Release --logger trx --results-directory "TestResults" --blame --blame-hang --blame-hang-timeout 1min --diag "TestResults/vstest_diagnostics.log"

- name: Upload dotnet test results
if: always()
uses: actions/upload-artifact@v4
with:
name: dotnet-results-${{ matrix.dotnet-version }}
path: TestResults-${{ matrix.dotnet-version }}
name: dotnet-results
path: TestResults
- name: Post test results to GitHub
uses: dorny/test-reporter@v1
if: always()
with:
name: .NET Tests
path: TestResults-${{ matrix.dotnet-version }}/*.trx
path: TestResults/*.trx
reporter: dotnet-trx
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ on:

env:
PACKAGE_NAME: Descope
RELEASE_VERSION: ${{ github.event.release.tag_name }}

jobs:
deploy:
publish:
runs-on: ubuntu-latest
permissions:
packages: write
Expand All @@ -17,12 +18,11 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-dotnet@v4
with:
dotnet-version: "6.0.x" # SDK Version to use.
source-url: https://nuget.pkg.github.com/${{github.repository_owner}}/index.json
env:
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
- run: dotnet build --configuration Release ${{ env.PACKAGE_NAME }}
- name: Create the package
run: dotnet pack --configuration Release ${{ env.PACKAGE_NAME }}
- name: Publish the package to GPR
run: dotnet nuget push ${{ env.PACKAGE_NAME }}/bin/Release/*.nupkg
run: echo dotnet nuget push ${{ env.PACKAGE_NAME }}/bin/Release/*.nupkg
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"xml.format.maxLineWidth": 0
}
2 changes: 1 addition & 1 deletion Descope.Test/Descope.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
Expand Down
Loading

0 comments on commit c0a4799

Please sign in to comment.