feature: add jcdcdev.Umbraco.Core

jcdcdev · jcdcdev · commit a7637d96b727 · 2024-04-09T22:23:25.000+01:00
diff --git a/src/Umbraco.Community.FileSystemProviders.B2/Composing/Composer.cs b/src/Umbraco.Community.FileSystemProviders.B2/Composing/Composer.cs
@@ -12,7 +12,6 @@ public class Composer : IComposer
 {
     public void Compose(IUmbracoBuilder builder)
     {
-        builder.ManifestFilters().Append<ManifestFilter>();
         builder.AddB2MediaFileSystem();
     }
 }
diff --git a/src/Umbraco.Community.FileSystemProviders.B2/Composing/ManifestFilter.cs b/src/Umbraco.Community.FileSystemProviders.B2/Composing/ManifestFilter.cs
diff --git a/src/Umbraco.Community.FileSystemProviders.B2/Composing/PackageManifest.cs b/src/Umbraco.Community.FileSystemProviders.B2/Composing/PackageManifest.cs
@@ -0,0 +1,9 @@
+﻿using jcdcdev.Umbraco.Core.Composing;
+
+namespace Umbraco.Community.FileSystemProviders.B2.Composing;
+
+public class PackageManifest : SimplePackageManifest
+{
+    protected override string PackageName => Constants.PackageName;
+    protected override bool AllowPackageTelemetry => true;
+}
diff --git a/src/Umbraco.Community.FileSystemProviders.B2/Constants.cs b/src/Umbraco.Community.FileSystemProviders.B2/Constants.cs
@@ -2,6 +2,7 @@ namespace Umbraco.Community.FileSystemProviders.B2;
 
 public class Constants
 {
+    public const string PackageName = "Umbraco.Community.FileSystemProviders.B2";
     public const string Section = "Umbraco:Storage:B2:Media";
 
     public class HealthChecks
diff --git a/src/Umbraco.Community.FileSystemProviders.B2/HealthChecks/ApplicationKeyHealthCheck.cs b/src/Umbraco.Community.FileSystemProviders.B2/HealthChecks/ApplicationKeyHealthCheck.cs
@@ -1,3 +1,4 @@
+using jcdcdev.Umbraco.Core.HealthChecks;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core.HealthChecks;
 using Umbraco.Cms.Core.Services;
@@ -10,8 +11,12 @@ namespace Umbraco.Community.FileSystemProviders.B2.HealthChecks;
     Constants.HealthChecks.ApplicationKey.Name,
     Description = Constants.HealthChecks.ApplicationKey.Description,
     Group = Constants.HealthChecks.Groups.Configuration)]
-internal class ApplicationKeyHealthCheck(ILocalizedTextService textService, IOptions<B2Options> options) : ConfigurationNotNullHealthcheck<B2Options>(textService, options)
+internal class ApplicationKeyHealthCheck : ConfigurationNotNullHealthcheck<B2Options>
 {
+    public ApplicationKeyHealthCheck(ILocalizedTextService textService, IOptions<B2Options> options) : base(textService, options)
+    {
+    }
+
     public override string ItemPath => Constants.HealthChecks.ApplicationKey.ItemPath;
     public override string ReadMoreLink => Constants.HealthChecks.ApplicationKey.ReadMoreLink;
     public override string CurrentValue => Options.Credentials?.ApplicationKey ?? string.Empty;
diff --git a/src/Umbraco.Community.FileSystemProviders.B2/HealthChecks/BucketNameHealthCheck.cs b/src/Umbraco.Community.FileSystemProviders.B2/HealthChecks/BucketNameHealthCheck.cs
@@ -1,3 +1,4 @@
+using jcdcdev.Umbraco.Core.HealthChecks;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core.HealthChecks;
diff --git a/src/Umbraco.Community.FileSystemProviders.B2/HealthChecks/ConfigurationNotNullHealthcheck.cs b/src/Umbraco.Community.FileSystemProviders.B2/HealthChecks/ConfigurationNotNullHealthcheck.cs
diff --git a/src/Umbraco.Community.FileSystemProviders.B2/HealthChecks/KeyIdHealthCheck.cs b/src/Umbraco.Community.FileSystemProviders.B2/HealthChecks/KeyIdHealthCheck.cs
@@ -1,3 +1,4 @@
+using jcdcdev.Umbraco.Core.HealthChecks;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core.HealthChecks;
 using Umbraco.Cms.Core.Services;
diff --git a/src/Umbraco.Community.FileSystemProviders.B2/HealthChecks/ServiceUrlHealthCheck.cs b/src/Umbraco.Community.FileSystemProviders.B2/HealthChecks/ServiceUrlHealthCheck.cs
@@ -1,3 +1,4 @@
+using jcdcdev.Umbraco.Core.HealthChecks;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core.HealthChecks;
 using Umbraco.Cms.Core.Services;
diff --git a/src/Umbraco.Community.FileSystemProviders.B2/Umbraco.Community.FileSystemProviders.B2.csproj b/src/Umbraco.Community.FileSystemProviders.B2/Umbraco.Community.FileSystemProviders.B2.csproj
@@ -30,6 +30,7 @@
         <PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="[10.4.0,11.0.0)"/>
         <PackageReference Include="Umbraco.Cms.Web.Common" Version="[10.4.0,11.0.0)"/>
         <PackageReference Include="Our.Umbraco.StorageProviders.AWSS3" Version="1.3.0"/>
+        <PackageReference Include="jcdcdev.Umbraco.Core" Version="0.3.1" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
@@ -38,6 +39,7 @@
         <PackageReference Include="Umbraco.Cms.Web.Common" Version="[11.0.0,13.0.0)"/>
         <PackageReference Include="Umbraco.Cms.Imaging.ImageSharp" Version="[11.0.0,13.0.0)"/>
         <PackageReference Include="Our.Umbraco.StorageProviders.AWSS3" Version="1.3.0"/>
+        <PackageReference Include="jcdcdev.Umbraco.Core" Version="0.3.1" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
@@ -46,6 +48,7 @@
         <PackageReference Include="Umbraco.Cms.Web.Common" Version="[13.0.0,14.0.0)"/>
         <PackageReference Include="Umbraco.Cms.Imaging.ImageSharp" Version="[13.0.0,14.0.0)"/>
         <PackageReference Include="Our.Umbraco.StorageProviders.AWSS3" Version="1.3.0"/>
+        <PackageReference Include="jcdcdev.Umbraco.Core" Version="0.3.1" />
     </ItemGroup>
 
     <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
@@ -58,4 +61,7 @@
         <None Include="..\..\docs\icon.png" Pack="true" PackagePath="images\icon.png"/>
         <None Include="..\..\.github\README.md" Pack="true" PackagePath="\"/>
     </ItemGroup>
+
+    <ItemGroup>
+    </ItemGroup>
 </Project>
diff --git a/src/Umbraco.Community.FileSystemProviders.B2/packages.lock.json b/src/Umbraco.Community.FileSystemProviders.B2/packages.lock.json
@@ -2,6 +2,17 @@
   "version": 1,
   "dependencies": {
     "net6.0": {
+      "jcdcdev.Umbraco.Core": {
+        "type": "Direct",
+        "requested": "[0.3.1, )",
+        "resolved": "0.3.1",
+        "contentHash": "96ZLQ1gwo9mPCJLEgb4BsRvD4ZxgzFlZ6pCWqEeY1WpQM8B+SINuMpRMt9vAfZkiVKZ8KGsXgdKLLpCoPy1TVw==",
+        "dependencies": {
+          "Umbraco.Cms.Web.BackOffice": "[10.4.0, 11.0.0)",
+          "Umbraco.Cms.Web.Common": "[10.4.0, 11.0.0)",
+          "Umbraco.Cms.Web.Website": "[10.4.0, 11.0.0)"
+        }
+      },
       "Our.Umbraco.StorageProviders.AWSS3": {
         "type": "Direct",
         "requested": "[1.3.0, )",
@@ -2278,9 +2289,30 @@
           "Umbraco.Cms.Core": "10.4.0",
           "Umbraco.Cms.Infrastructure": "10.4.0"
         }
+      },
+      "Umbraco.Cms.Web.Website": {
+        "type": "Transitive",
+        "resolved": "10.4.0",
+        "contentHash": "S2a9aNx4CKKpWXr2VN3XxRjPSij59Uoip3g2yl90423x/m5XL+VGPAJYRB+MIj/zUl6WMoQ712I0mN8JagOQJA==",
+        "dependencies": {
+          "Umbraco.Cms.Core": "10.4.0",
+          "Umbraco.Cms.Infrastructure": "10.4.0",
+          "Umbraco.Cms.Web.Common": "10.4.0"
+        }
       }
     },
     "net7.0": {
+      "jcdcdev.Umbraco.Core": {
+        "type": "Direct",
+        "requested": "[0.3.1, )",
+        "resolved": "0.3.1",
+        "contentHash": "96ZLQ1gwo9mPCJLEgb4BsRvD4ZxgzFlZ6pCWqEeY1WpQM8B+SINuMpRMt9vAfZkiVKZ8KGsXgdKLLpCoPy1TVw==",
+        "dependencies": {
+          "Umbraco.Cms.Web.BackOffice": "[11.0.0, 13.0.0)",
+          "Umbraco.Cms.Web.Common": "[11.0.0, 13.0.0)",
+          "Umbraco.Cms.Web.Website": "[11.0.0, 13.0.0)"
+        }
+      },
       "Our.Umbraco.StorageProviders.AWSS3": {
         "type": "Direct",
         "requested": "[1.3.0, )",
@@ -4446,9 +4478,30 @@
           "Umbraco.Cms.Core": "11.0.0",
           "Umbraco.Cms.Infrastructure": "11.0.0"
         }
+      },
+      "Umbraco.Cms.Web.Website": {
+        "type": "Transitive",
+        "resolved": "11.0.0",
+        "contentHash": "HBkwHjRw7x/iiskh74BbO+hjSMt+yH9Q6b0581aItbtPYtJXtHLYxy/MyKy5hkseMG+3HyIviZHxxwGsWfnjXw==",
+        "dependencies": {
+          "Umbraco.Cms.Core": "11.0.0",
+          "Umbraco.Cms.Infrastructure": "11.0.0",
+          "Umbraco.Cms.Web.Common": "11.0.0"
+        }
       }
     },
     "net8.0": {
+      "jcdcdev.Umbraco.Core": {
+        "type": "Direct",
+        "requested": "[0.3.1, )",
+        "resolved": "0.3.1",
+        "contentHash": "96ZLQ1gwo9mPCJLEgb4BsRvD4ZxgzFlZ6pCWqEeY1WpQM8B+SINuMpRMt9vAfZkiVKZ8KGsXgdKLLpCoPy1TVw==",
+        "dependencies": {
+          "Umbraco.Cms.Web.BackOffice": "[13.0.0, 14.0.0)",
+          "Umbraco.Cms.Web.Common": "[13.0.0, 14.0.0)",
+          "Umbraco.Cms.Web.Website": "[13.0.0, 14.0.0)"
+        }
+      },
       "Our.Umbraco.StorageProviders.AWSS3": {
         "type": "Direct",
         "requested": "[1.3.0, )",
@@ -6628,6 +6681,14 @@
           "Umbraco.Cms.Infrastructure": "[13.0.0, 14.0.0)"
         }
       },
+      "Umbraco.Cms.Web.Website": {
+        "type": "Transitive",
+        "resolved": "13.0.0",
+        "contentHash": "EFpo37/hVP53sRZddETv1ozfG87FbboUWjlthqvQVgC1LrLVFB0ozGwnOrcdSad70wGfSqP7OboapWloYwpqRA==",
+        "dependencies": {
+          "Umbraco.Cms.Web.Common": "[13.0.0, 14.0.0)"
+        }
+      },
       "Umbraco.CSharpTest.Net.Collections": {
         "type": "Transitive",
         "resolved": "15.0.0",

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ public class Composer : IComposer`
`12`	`12`	`{`
`13`	`13`	`public void Compose(IUmbracoBuilder builder)`
`14`	`14`	`{`
`15`		`- builder.ManifestFilters().Append<ManifestFilter>();`
`16`	`15`	`builder.AddB2MediaFileSystem();`
`17`	`16`	`}`
`18`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ namespace Umbraco.Community.FileSystemProviders.B2;`
`2`	`2`
`3`	`3`	`public class Constants`
`4`	`4`	`{`
	`5`	`+ public const string PackageName = "Umbraco.Community.FileSystemProviders.B2";`
`5`	`6`	`public const string Section = "Umbraco:Storage:B2:Media";`
`6`	`7`
`7`	`8`	`public class HealthChecks`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using jcdcdev.Umbraco.Core.HealthChecks;`
`1`	`2`	`using Microsoft.Extensions.Hosting;`
`2`	`3`	`using Microsoft.Extensions.Options;`
`3`	`4`	`using Umbraco.Cms.Core.HealthChecks;`