diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b37b09b55..10db133f2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ on: - "**.csproj" env: - DOTNET_VERSION: "7.0.401" + DOTNET_VERSION: "8.0.100" jobs: build: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d9deafe45..b9e06dddb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: "Tagged Release" on: push: - branches: [ rel-7.4.0 ] + branches: [ rel-8.0.0 ] jobs: tagged-release: @@ -14,4 +14,4 @@ jobs: with: repo_token: "${{ secrets.GITHUB_TOKEN }}" prerelease: false - automatic_release_tag: "7.4.0" + automatic_release_tag: "8.0.0" diff --git a/apps/vue/src/api/openiddict/open-iddict-application/model/index.ts b/apps/vue/src/api/openiddict/open-iddict-application/model/index.ts index 09e2349a1..9e4458378 100644 --- a/apps/vue/src/api/openiddict/open-iddict-application/model/index.ts +++ b/apps/vue/src/api/openiddict/open-iddict-application/model/index.ts @@ -2,15 +2,15 @@ export interface OpenIddictApplicationGetListInput extends PagedAndSortedResultR filter?: string; } -export interface OpenIddictApplicationCreateDto extends OpenIddictApplicationCreateOrUpdateDto { -} +export type OpenIddictApplicationCreateDto = OpenIddictApplicationCreateOrUpdateDto; -export interface OpenIddictApplicationUpdateDto extends OpenIddictApplicationCreateOrUpdateDto { -} +export type OpenIddictApplicationUpdateDto = OpenIddictApplicationCreateOrUpdateDto; export interface OpenIddictApplicationDto extends ExtensibleAuditedEntityDto { clientId: string; clientSecret?: string; + clientType?: string; + applicationType?: string; consentType?: string; displayName?: string; displayNames?: Dictionary; @@ -22,7 +22,6 @@ export interface OpenIddictApplicationDto extends ExtensibleAuditedEntityDto; redirectUris?: string[]; requirements?: string[]; - type?: string; clientUri?: string; logoUri?: string; } @@ -30,6 +29,8 @@ export interface OpenIddictApplicationDto extends ExtensibleAuditedEntityDto; @@ -41,8 +42,6 @@ export interface OpenIddictApplicationCreateOrUpdateDto extends ExtensibleObject properties?: Dictionary; redirectUris?: string[]; requirements?: string[]; - type?: string; clientUri?: string; logoUri?: string; } - diff --git a/apps/vue/src/views/openiddict/applications/components/ApplicationModal.vue b/apps/vue/src/views/openiddict/applications/components/ApplicationModal.vue index bd2a8cd81..dc00e7474 100644 --- a/apps/vue/src/views/openiddict/applications/components/ApplicationModal.vue +++ b/apps/vue/src/views/openiddict/applications/components/ApplicationModal.vue @@ -18,11 +18,23 @@ + + - - @@ -39,7 +51,11 @@ :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }" > - @@ -63,14 +79,10 @@