Implement IFileProviderFactory, move shared infrastructure to Umbraco.StorageProviders and support Umbraco 10

.editorconfig

@@ -27,11 +27,13 @@ indent_size = 2
 dotnet_style_predefined_type_for_locals_parameters_members = true:error
 
 dotnet_naming_rule.private_members_with_underscore.symbols  = private_fields
-dotnet_naming_rule.private_members_with_underscore.style    = prefix_underscore
+dotnet_naming_rule.private_members_with_underscore.style = prefix_underscore
 dotnet_naming_rule.private_members_with_underscore.severity = suggestion
 
-dotnet_naming_symbols.private_fields.applicable_kinds           = field
+dotnet_naming_symbols.private_fields.applicable_kinds = field
 dotnet_naming_symbols.private_fields.applicable_accessibilities = private
 
 dotnet_naming_style.prefix_underscore.capitalization = camel_case
 dotnet_naming_style.prefix_underscore.required_prefix = _
+
+dotnet_diagnostic.CA1054.severity = suggestion

.github/workflows/prepare-release.yml

@@ -0,0 +1,53 @@
+name: Prepare release
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'The prerelease tag to apply on the release branch (if any). If not specified, any existing prerelease tag will be removed.'
+        required: false
+        default: ''
+        type: choice
+        options:
+        - ''
+        - 'beta'
+        - 'rc'
+      versionIncrement:
+        description: 'Specifies which part of the version on the current branch is incremented.'
+        required: true
+        default: 'minor'
+        type: choice
+        options:
+        - 'major'
+        - 'minor'
+        - 'build'
+
+env:
+  DOTNET_NOLOGO: true
+  DOTNET_GENERATE_ASPNET_CERTIFICATE: false
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+
+jobs:
+  prepare-release:
+    name: Prepare release
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Configure git
+        run: |
+          git config user.name 'github-actions[bot]'
+          git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
+
+      - name: Setup Nerdbank.GitVersioning
+        run: dotnet tool install --tool-path . nbgv
+
+      - name: Prepare release
+        run: ./nbgv prepare-release ${{ github.event.inputs.tag }} -p src --versionIncrement ${{ github.event.inputs.versionIncrement }}
+
+      - name: Push commit (and new branch)
+        run: git push --all

.github/workflows/publish-release.yml

@@ -0,0 +1,34 @@
+name: Publish release
+
+on:
+  workflow_dispatch:
+
+env:
+  DOTNET_NOLOGO: true
+  DOTNET_GENERATE_ASPNET_CERTIFICATE: false
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+
+jobs:
+  publish-release:
+    name: Publish release
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Configure git
+        run: |
+          git config user.name 'github-actions[bot]'
+          git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
+
+      - name: Setup Nerdbank.GitVersioning
+        run: dotnet tool install --tool-path . nbgv
+
+      - name: Tag release
+        run: ./nbgv tag -p src
+
+      - name: Push git tags
+        run: git push --tags

.gitignore

@@ -1,7 +1,3 @@
-*.dll
-*.exe
-*.log
-*.nupkg
 *.suo
 *.user
 
@@ -10,7 +6,3 @@
 .vscode/
 [Bb]in/
 [Oo]bj/
-
-Build/temp
-build.out/
-build.tmp/

README.md

@@ -1,73 +1,84 @@
-# Umbraco.StorageProviders
+# Umbraco storage providers
 
 This repository contains Umbraco storage providers that can replace the default physical file storage.
 
-## Umbraco.StorageProviders.AzureBlob
-
-The Azure Blob Storage provider has an implementation of the Umbraco `IFileSystem` that connects to an Azure Blob Storage container.
+## Umbraco.StorageProviders
 
-It also has the following features:
-- middleware for serving media files from the `/media` path
-- ImageSharp image provider/cache
-- a CDN media URL provider
+Contains shared storage providers infrastructure, like a CDN media URL provider.
 
 ### Usage
 
-This provider can be added in the `Startup.cs` file:
-
 ```csharp
 public void ConfigureServices(IServiceCollection services)
 {
     services.AddUmbraco(_env, _config)
         .AddBackOffice()
         .AddWebsite()
         .AddComposers()
-        // Add the Azure Blob Storage file system, ImageSharp image provider/cache and middleware for Media:
-        .AddAzureBlobMediaFileSystem() 
-        // Optionally add the CDN media URL provider:
+        // Add the CDN media URL provider:
         .AddCdnMediaUrlProvider()
         .Build();
 }
+```
 
-public void Configure(IApplicationBuilder app)
+There're multiple ways to configure the CDN provider, it can be done in code:
+
+```csharp
+.AddCdnMediaUrlProvider(options => {
+    options.Url = new Uri("https://cdn.example.com/");
+});
+```
+
+In `appsettings.json`:
+
+```json
 {
-    if (env.IsDevelopment())
-    {
-        app.UseDeveloperExceptionPage();
+  "Umbraco": {
+    "Storage": {
+      "Cdn": {
+        "Url": "https://cdn.example.com/"
+      }
     }
-
-    app.UseUmbraco()
-        .WithMiddleware(u =>
-        {
-            u.UseBackOffice();
-            u.UseWebsite();
-            // Enables the Azure Blob Storage middleware for Media:
-            u.UseAzureBlobMediaFileSystem();
-
-        })
-        .WithEndpoints(u =>
-        {
-            u.UseInstallerEndpoints();
-            u.UseBackOfficeEndpoints();
-            u.UseWebsiteEndpoints();
-        });
+  }
 }
 ```
 
-There're multiple ways to configure the provider, it can be done in code:
+Or by environment variables:
 
-```csharp
-services.AddUmbraco(_env, _config)
+```sh
+UMBRACO__STORAGE__CDN__URL=<CDN_BASE_URL>
+```
 
-    .AddAzureBlobMediaFileSystem(options => {
-        options.ConnectionString = "";
-        options.ContainerName = "";
-    })
+_Note: you still have to add the provider in the `Startup.cs` file when not configuring the options in code._
 
-    .AddCdnMediaUrlProvider(options => {
-        options.Url = new Uri("https://my-cdn.example.com/");
-    });
+## Umbraco.StorageProviders.AzureBlob
 
+The Azure Blob Storage provider has an implementation of the Umbraco `IFileSystem` that connects to an Azure Blob Storage container.
+
+### Usage
+
+This provider can be added in the `Startup.cs` file:
+
+```csharp
+public void ConfigureServices(IServiceCollection services)
+{
+    services.AddUmbraco(_env, _config)
+        .AddBackOffice()
+        .AddWebsite()
+        .AddComposers()
+        // Add the Azure Blob Storage file system
+        .AddAzureBlobMediaFileSystem() 
+        .Build();
+}
+```
+
+There're multiple ways to configure the provider, it can be done in code:
+
+```csharp
+.AddAzureBlobMediaFileSystem(options => {
+    options.ConnectionString = "";
+    options.ContainerName = "";
+})
 ```
 
 In `appsettings.json`:
@@ -79,10 +90,7 @@ In `appsettings.json`:
       "AzureBlob": {
         "Media": {
           "ConnectionString": "",
-          "ContainerName": "",
-          "Cdn": {
-            "Url": ""
-          }
+          "ContainerName": ""
         }
       }
     }
@@ -95,22 +103,21 @@ Or by environment variables:
 ```sh
 UMBRACO__STORAGE__AZUREBLOB__MEDIA__CONNECTIONSTRING=<CONNECTION_STRING>
 UMBRACO__STORAGE__AZUREBLOB__MEDIA__CONTAINERNAME=<CONTAINER_NAME>
-UMBRACO__STORAGE__AZUREBLOB__MEDIA__CDN__URL=<CDN_BASE_URL>
 ```
 
 _Note: you still have to add the provider in the `Startup.cs` file when not configuring the options in code._
 
-## Using the file system provider
-
-Please refer to our documentation on [using custom file systems](https://our.umbraco.com/documentation/Extending/FileSystemProviders/).
-
-## Folder structure in the Azure Blob Storage container
+### Folder structure in the Azure Blob Storage container
 The container name is expected to exist and uses the following folder structure:
 - `/media` - contains the Umbraco media, stored in the structure defined by the `IMediaPathScheme` registered in Umbraco (the default `UniqueMediaPathScheme` stores files with their original filename in 8 character directories, based on the content and property GUID identifier)
 - `/cache` - contains the ImageSharp image cache, stored as files with a filename defined by the `ICacheHash` registered in ImageSharp (the default `CacheHash` generates SHA256 hashes of the file contents and uses the first characters configured by the `Umbraco:CMS:Imaging:CachedNameLength` setting)
 
 Note that this is different than the behavior of other file system providers - i.e. https://github.com/umbraco-community/UmbracoFileSystemProviders.Azure that expect the media contents to be at the root level.
 
+## Using the file system providers
+
+Please refer to our documentation on [using custom file systems](https://our.umbraco.com/documentation/Extending/FileSystemProviders/).
+
 ## Bugs, issues and Pull Requests
 
 If you encounter a bug when using this client library you are welcome to open an issue in the issue tracker of this repository. We always welcome Pull Request and please feel free to open an issue before submitting a Pull Request to discuss what you want to submit.

Umbraco.StorageProviders.sln

@@ -13,10 +13,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		azure-pipelines.yml = azure-pipelines.yml
 		src\Directory.Build.props = src\Directory.Build.props
 		LICENSE = LICENSE
-		NuGet.config = NuGet.config
 		README.md = README.md
+		src\version.json = src\version.json
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.StorageProviders", "src\Umbraco.StorageProviders\Umbraco.StorageProviders.csproj", "{5EC38982-2C9A-4D8D-AAE2-743A690FCD71}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,6 +41,18 @@ Global
 		{99A3FCBE-FDC6-4580-BDB8-7D219C6D98C3}.Release|x64.Build.0 = Release|Any CPU
 		{99A3FCBE-FDC6-4580-BDB8-7D219C6D98C3}.Release|x86.ActiveCfg = Release|Any CPU
 		{99A3FCBE-FDC6-4580-BDB8-7D219C6D98C3}.Release|x86.Build.0 = Release|Any CPU
+		{5EC38982-2C9A-4D8D-AAE2-743A690FCD71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5EC38982-2C9A-4D8D-AAE2-743A690FCD71}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5EC38982-2C9A-4D8D-AAE2-743A690FCD71}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5EC38982-2C9A-4D8D-AAE2-743A690FCD71}.Debug|x64.Build.0 = Debug|Any CPU
+		{5EC38982-2C9A-4D8D-AAE2-743A690FCD71}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5EC38982-2C9A-4D8D-AAE2-743A690FCD71}.Debug|x86.Build.0 = Debug|Any CPU
+		{5EC38982-2C9A-4D8D-AAE2-743A690FCD71}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5EC38982-2C9A-4D8D-AAE2-743A690FCD71}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5EC38982-2C9A-4D8D-AAE2-743A690FCD71}.Release|x64.ActiveCfg = Release|Any CPU
+		{5EC38982-2C9A-4D8D-AAE2-743A690FCD71}.Release|x64.Build.0 = Release|Any CPU
+		{5EC38982-2C9A-4D8D-AAE2-743A690FCD71}.Release|x86.ActiveCfg = Release|Any CPU
+		{5EC38982-2C9A-4D8D-AAE2-743A690FCD71}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE