Skip to content

Commit 8083a92

Browse files
committed
Update package manifest
1 parent 971a074 commit 8083a92

File tree

5 files changed

+33
-19
lines changed

5 files changed

+33
-19
lines changed

src/Umbraco.AuthorizedServices/AuthorizedServicesComposer.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Microsoft.Extensions.Configuration;
22
using Microsoft.Extensions.DependencyInjection;
33
using Umbraco.AuthorizedServices.Configuration;
4+
using Umbraco.AuthorizedServices.Manifests;
45
using Umbraco.AuthorizedServices.Migrations;
56
using Umbraco.AuthorizedServices.Services;
67
using Umbraco.AuthorizedServices.Services.Implement;
@@ -18,6 +19,9 @@ public void Compose(IUmbracoBuilder builder)
1819
IConfigurationSection configSection = builder.Config.GetSection("Umbraco:AuthorizedServices");
1920
builder.Services.Configure<AuthorizedServiceSettings>(configSection);
2021

22+
// manifest filter
23+
builder.ManifestFilters().Append<AuthorizedServicesManifestFilter>();
24+
2125
builder.Services.AddUnique<IAuthorizationClientFactory, AuthorizationClientFactory>();
2226
builder.Services.AddUnique<IAuthorizationParametersBuilder, AuthorizationParametersBuilder>();
2327
builder.Services.AddUnique<IAuthorizationRequestSender, AuthorizationRequestSender>();

src/Umbraco.AuthorizedServices/ClientApp/src/package.manifest

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/Umbraco.AuthorizedServices/Constants.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System.Diagnostics;
2+
13
namespace Umbraco.AuthorizedServices;
24

35
public static class Constants
@@ -6,6 +8,8 @@ public static class Constants
68

79
public const string Separator = "-";
810

11+
public static readonly string InformationalVersion = FileVersionInfo.GetVersionInfo(typeof(Constants).Assembly.Location).ProductVersion!;
12+
913
public static class Trees
1014
{
1115
public const string AuthorizedServices = nameof(AuthorizedServices);
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
using Umbraco.Cms.Core.Manifest;
2+
3+
namespace Umbraco.AuthorizedServices.Manifests;
4+
5+
public class AuthorizedServicesManifestFilter : IManifestFilter
6+
{
7+
public void Filter(List<PackageManifest> manifests)
8+
{
9+
manifests.Add(new PackageManifest
10+
{
11+
AllowPackageTelemetry = true,
12+
Version = Constants.InformationalVersion,
13+
PackageName = "Umbraco Authorized Services",
14+
BundleOptions = BundleOptions.None,
15+
Scripts = new[]
16+
{
17+
"/App_Plugins/UmbracoAuthorizedServices/index.js"
18+
},
19+
Stylesheets = new[]
20+
{
21+
"/App_Plugins/UmbracoAuthorizedServices/css/style.css"
22+
}
23+
});
24+
}
25+
}

src/Umbraco.AuthorizedServices/Umbraco.AuthorizedServices.csproj

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,7 @@
3232
<ClientAssetsInputs Remove="ClientApp\src\css\style.css" />
3333
</ItemGroup>
3434

35-
<!-- Update package.manifest files with current build version after client assets build -->
3635
<ItemGroup>
3736
<PackageReference Include="Umbraco.JsonSchema.Extensions" Version="0.3.0" PrivateAssets="all" />
3837
</ItemGroup>
39-
<Target Name="UpdatePackageManifestVersion" DependsOnTargets="ClientAssetsBuild" AfterTargets="GetUmbracoBuildVersion">
40-
<ItemGroup>
41-
<_PackageManifestFiles Include="$(IntermediateOutputPath)clientassets\**\package.manifest" />
42-
</ItemGroup>
43-
<JsonPathUpdateValue JsonFile="%(_PackageManifestFiles.FullPath)" Path="$.version" Value="&quot;$(PackageVersion)&quot;" />
44-
</Target>
4538
</Project>

0 commit comments

Comments
 (0)