Skip to content

Commit 8be28fd

Browse files
ronaldbarendseronaldbarendse
committed
Merge branch 'main' into develop
2 parents 5e650f5 + 3b3ee8c commit 8be28fd

File tree

11 files changed

+919
-920
lines changed

11 files changed

+919
-920
lines changed

‎Directory.Packages.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
</PropertyGroup>
55
<ItemGroup>
66
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
7-
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.5.113" />
7+
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.5.119" />
88
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" />
99
<GlobalPackageReference Include="Umbraco.Code" Version="2.0.0" />
10-
<GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.1.1" />
10+
<GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
1111
</ItemGroup>
1212
<ItemGroup>
13-
<PackageVersion Include="Azure.Storage.Blobs" Version="12.14.0" />
13+
<PackageVersion Include="Azure.Storage.Blobs" Version="12.14.1" />
1414
<PackageVersion Include="SixLabors.ImageSharp.Web.Providers.Azure" Version="2.0.2" />
15-
<PackageVersion Include="Umbraco.Cms.Imaging.ImageSharp" Version="[11.0.0-rc1, 12)" />
16-
<PackageVersion Include="Umbraco.Cms.Web.Common" Version="[11.0.0-rc1, 12)" />
15+
<PackageVersion Include="Umbraco.Cms.Imaging.ImageSharp" Version="[11.0.0, 12)" />
16+
<PackageVersion Include="Umbraco.Cms.Web.Common" Version="[11.0.0, 12)" />
1717
</ItemGroup>
1818
</Project>

‎NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
</packageSources>
99
<packageSourceMapping>
1010
<packageSource key="nuget.org">
11+
<package pattern="Umbraco.Cms.*" />
1112
<package pattern="*" />
1213
</packageSource>
1314
<packageSource key="Umbraco Prereleases">

‎src/Umbraco.StorageProviders.AzureBlob.ImageSharp/packages.lock.json

Lines changed: 257 additions & 309 deletions
Large diffs are not rendered by default.

‎src/Umbraco.StorageProviders.AzureBlob/Umbraco.StorageProviders.AzureBlob.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@
99
<PackageReference Include="Azure.Storage.Blobs" />
1010
<ProjectReference Include="..\Umbraco.StorageProviders\Umbraco.StorageProviders.csproj" />
1111
</ItemGroup>
12+
<ItemGroup>
13+
<Content Include="buildTransitive\**" PackagePath="buildTransitive" />
14+
<Content Include="appsettings-schema.Umbraco.StorageProviders.AzureBlob.json" PackagePath="" />
15+
</ItemGroup>
1216
</Project>

‎src/Umbraco.StorageProviders.AzureBlob/appsettings-schema.Umbraco.StorageProviders.AzureBlob.json

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
{
2+
"$schema": "http://json-schema.org/draft-04/schema#",
3+
"title": "UmbracoStorageProvidersSchema",
4+
"type": "object",
5+
"properties": {
6+
"Umbraco": {
7+
"$ref": "#/definitions/UmbracoDefinition"
8+
}
9+
},
10+
"definitions": {
11+
"UmbracoDefinition": {
12+
"type": "object",
13+
"description": "Configuration container for all Umbraco products.",
14+
"properties": {
15+
"Storage": {
16+
"$ref": "#/definitions/UmbracoStorageProvidersDefinition"
17+
}
18+
}
19+
},
20+
"UmbracoStorageProvidersDefinition": {
21+
"type": "object",
22+
"description": "Configuration of Umbraco Storage Providers.",
23+
"properties": {
24+
"AzureBlob": {
25+
"$ref": "#/definitions/UmbracoStorageProvidersAzureBlobDefinition"
26+
}
27+
}
28+
},
29+
"UmbracoStorageProvidersAzureBlobDefinition": {
30+
"type": "object",
31+
"description": "Configuration of Umbraco Storage Providers - Azure Blob Storage.",
32+
"properties": {
33+
"Media": {
34+
"$ref": "#/definitions/AzureBlobFileSystemOptions"
35+
}
36+
},
37+
"patternProperties": {
38+
"^(?!Media$).*": {
39+
"allOf": [
40+
{
41+
"$ref": "#/definitions/AzureBlobFileSystemOptions"
42+
},
43+
{
44+
"type": "object",
45+
"required": [
46+
"VirtualPath"
47+
]
48+
}
49+
]
50+
}
51+
}
52+
},
53+
"AzureBlobFileSystemOptions": {
54+
"type": "object",
55+
"description": "The Azure Blob File System options.",
56+
"required": [
57+
"ConnectionString",
58+
"ContainerName"
59+
],
60+
"properties": {
61+
"ConnectionString": {
62+
"type": "string",
63+
"description": "Gets or sets the storage account connection string.",
64+
"minLength": 1
65+
},
66+
"ContainerName": {
67+
"type": "string",
68+
"description": "Gets or sets the container name.",
69+
"minLength": 1
70+
},
71+
"ContainerRootPath": {
72+
"type": [
73+
"null",
74+
"string"
75+
],
76+
"description": "Gets or sets the root path of the container."
77+
},
78+
"VirtualPath": {
79+
"type": "string",
80+
"description": "Gets or sets the virtual path.",
81+
"minLength": 1
82+
}
83+
}
84+
}
85+
}
86+
}

‎src/Umbraco.StorageProviders.AzureBlob/buildTransitive/Umbraco.StorageProviders.AzureBlob.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<ItemGroup>
3+
<UmbracoJsonSchemaFiles Include="$(MSBuildThisFileDirectory)..\appsettings-schema.Umbraco.StorageProviders.AzureBlob.json" Weight="-49" />
4+
</ItemGroup>
5+
</Project>

0 commit comments

Comments
 (0)