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.

Sign up for GitHub

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

Jump to bottom

feat: update deps 2 #287

Merged
merged 2 commits into from
Mar 6, 2024
Merged

feat: update deps 2 #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efab6c1
feat: update deps 2
nikcio Mar 6, 2024
bcc82b0
test: Try other parallel
nikcio Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Examples/Examples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Umbraco.Cms" Version="12.1.1" />
<PackageReference Include="Umbraco.Cms" Version="12.3.7" />
</ItemGroup>

<!-- Force Windows to use ICU. Otherwise Windows 10 2019H1+ will do it, but older Windows 10 and most, if not all, Windows Server editions will run NLS -->
Expand Down
95 changes: 95 additions & 0 deletions src/Examples/appsettings-schema.Umbraco.Cms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,85 @@
"type": "boolean",
"description": "Gets or sets a value indicating whether the Delivery API should output rich text values as JSON instead of HTML.\n ",
"default": false
},
"Media": {
"description": "Gets or sets the settings for the Media APIs of the Delivery API.\n ",
"oneOf": [
{
"$ref": "#/definitions/MediaSettings"
}
]
},
"MemberAuthorization": {
"description": "Gets or sets the member authorization settings for the Delivery API.\n ",
"oneOf": [
{
"type": "null"
},
{
"$ref": "#/definitions/MemberAuthorizationSettings"
}
]
}
}
},
"MediaSettings": {
"type": "object",
"description": "Typed configuration options for the Media APIs of the Delivery API.\n ",
"properties": {
"Enabled": {
"type": "boolean",
"description": "Gets or sets a value indicating whether the Media APIs of the Delivery API should be enabled.\n ",
"default": false
},
"PublicAccess": {
"type": "boolean",
"description": "Gets or sets a value indicating whether the Media APIs of the Delivery API (if enabled) should be\npublicly available or should require an API key for access.\n ",
"default": true
}
}
},
"MemberAuthorizationSettings": {
"type": "object",
"description": "Typed configuration options for member authorization settings for the Delivery API.\n ",
"properties": {
"AuthorizationCodeFlow": {
"description": "Gets or sets the Authorization Code Flow configuration for the Delivery API.\n ",
"oneOf": [
{
"type": "null"
},
{
"$ref": "#/definitions/AuthorizationCodeFlowSettings"
}
]
}
}
},
"AuthorizationCodeFlowSettings": {
"type": "object",
"description": "Typed configuration options for the Authorization Code Flow settings for the Delivery API.\n ",
"properties": {
"Enabled": {
"type": "boolean",
"description": "Gets or sets a value indicating whether Authorization Code Flow should be enabled for the Delivery API.\n ",
"default": false
},
"LoginRedirectUrls": {
"type": "array",
"description": "Gets or sets the URLs allowed to use as redirect targets after a successful login (session authorization).\n ",
"items": {
"type": "string",
"format": "uri"
}
},
"LogoutRedirectUrls": {
"type": "array",
"description": "Gets or sets the URLs allowed to use as redirect targets after a successful logout (session termination).\n ",
"items": {
"type": "string",
"format": "uri"
}
}
}
},
Expand Down Expand Up @@ -1157,6 +1236,10 @@
},
"UnPublishedContentCompression": {
"type": "boolean"
},
"UsePagedSqlQuery": {
"type": "boolean",
"default": true
}
}
},
Expand Down Expand Up @@ -1322,6 +1405,11 @@
"description": "Gets or sets a value for how long (in minutes) a user is locked out when a lockout occurs.\n ",
"format": "int32",
"default": 43200
},
"AllowConcurrentLogins": {
"type": "boolean",
"description": "Gets or sets a value indicating whether to allow concurrent logins.\n ",
"default": true
}
}
},
Expand Down Expand Up @@ -1357,6 +1445,13 @@
"items": {
"type": "string"
}
},
"AdditionalAssemblyExclusionEntries": {
"type": "array",
"description": "Gets or sets a value for the assemblies that will be excluded from scanning.\n ",
"items": {
"type": "string"
}
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion ...eadless.IntegrationTests.TestProject/Nikcio.UHeadless.IntegrationTests.TestProject.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Umbraco.Cms" Version="12.1.1" />
<PackageReference Include="Umbraco.Cms" Version="12.3.7" />
<PackageReference Include="usync" Version="12.1.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Nikcio.UHeadless.IntegrationTests/IntegrationTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace Nikcio.UHeadless.IntegrationTests;

[TestFixture]
[Parallelizable(ParallelScope.All)]
[Parallelizable(ParallelScope.Children)]
public abstract class IntegrationTestBase
{
}
95 changes: 95 additions & 0 deletions src/Nikcio.UHeadless.IntegrationTests/appsettings-schema.Umbraco.Cms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,85 @@
"type": "boolean",
"description": "Gets or sets a value indicating whether the Delivery API should output rich text values as JSON instead of HTML.\n ",
"default": false
},
"Media": {
"description": "Gets or sets the settings for the Media APIs of the Delivery API.\n ",
"oneOf": [
{
"$ref": "#/definitions/MediaSettings"
}
]
},
"MemberAuthorization": {
"description": "Gets or sets the member authorization settings for the Delivery API.\n ",
"oneOf": [
{
"type": "null"
},
{
"$ref": "#/definitions/MemberAuthorizationSettings"
}
]
}
}
},
"MediaSettings": {
"type": "object",
"description": "Typed configuration options for the Media APIs of the Delivery API.\n ",
"properties": {
"Enabled": {
"type": "boolean",
"description": "Gets or sets a value indicating whether the Media APIs of the Delivery API should be enabled.\n ",
"default": false
},
"PublicAccess": {
"type": "boolean",
"description": "Gets or sets a value indicating whether the Media APIs of the Delivery API (if enabled) should be\npublicly available or should require an API key for access.\n ",
"default": true
}
}
},
"MemberAuthorizationSettings": {
"type": "object",
"description": "Typed configuration options for member authorization settings for the Delivery API.\n ",
"properties": {
"AuthorizationCodeFlow": {
"description": "Gets or sets the Authorization Code Flow configuration for the Delivery API.\n ",
"oneOf": [
{
"type": "null"
},
{
"$ref": "#/definitions/AuthorizationCodeFlowSettings"
}
]
}
}
},
"AuthorizationCodeFlowSettings": {
"type": "object",
"description": "Typed configuration options for the Authorization Code Flow settings for the Delivery API.\n ",
"properties": {
"Enabled": {
"type": "boolean",
"description": "Gets or sets a value indicating whether Authorization Code Flow should be enabled for the Delivery API.\n ",
"default": false
},
"LoginRedirectUrls": {
"type": "array",
"description": "Gets or sets the URLs allowed to use as redirect targets after a successful login (session authorization).\n ",
"items": {
"type": "string",
"format": "uri"
}
},
"LogoutRedirectUrls": {
"type": "array",
"description": "Gets or sets the URLs allowed to use as redirect targets after a successful logout (session termination).\n ",
"items": {
"type": "string",
"format": "uri"
}
}
}
},
Expand Down Expand Up @@ -1157,6 +1236,10 @@
},
"UnPublishedContentCompression": {
"type": "boolean"
},
"UsePagedSqlQuery": {
"type": "boolean",
"default": true
}
}
},
Expand Down Expand Up @@ -1322,6 +1405,11 @@
"description": "Gets or sets a value for how long (in minutes) a user is locked out when a lockout occurs.\n ",
"format": "int32",
"default": 43200
},
"AllowConcurrentLogins": {
"type": "boolean",
"description": "Gets or sets a value indicating whether to allow concurrent logins.\n ",
"default": true
}
}
},
Expand Down Expand Up @@ -1357,6 +1445,13 @@
"items": {
"type": "string"
}
},
"AdditionalAssemblyExclusionEntries": {
"type": "array",
"description": "Gets or sets a value for the assemblies that will be excluded from scanning.\n ",
"items": {
"type": "string"
}
}
}
},
Expand Down
117 changes: 0 additions & 117 deletions test/test.sln
View file
Open in desktop

This file was deleted.

Loading
Loading