Skip to content

Commit 585183d

Browse files
committed
feature: support Umbraco 17.0.0-rc4
1 parent 21d4e6b commit 585183d

File tree

9 files changed

+592
-568
lines changed

9 files changed

+592
-568
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- name: Build
10-
uses: jcdcdev/jcdcdev.Umbraco.Github.Build@main
10+
uses: jcdcdev/jcdcdev.Umbraco.Github.Build@v17
1111
with:
1212
project-name: Umbraco.Community.SimpleTrees
1313
project-path: src/Umbraco.Community.SimpleTrees/Umbraco.Community.SimpleTrees.csproj
1414
npm-working-dir: src/Umbraco.Community.SimpleTrees.Client
1515
npm-enabled: true
16-
umbraco-version: 17
17-
dotnet-version: "10"
1816
npm-version: "22.x"

.github/workflows/release.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,15 @@ jobs:
1313
steps:
1414
- name: Build
1515
id: build
16-
uses: jcdcdev/jcdcdev.Umbraco.GitHub.Build@main
16+
uses: jcdcdev/jcdcdev.Umbraco.Github.Build@v17
1717
with:
1818
project-name: Umbraco.Community.SimpleTrees
1919
project-path: src/Umbraco.Community.SimpleTrees/Umbraco.Community.SimpleTrees.csproj
2020
npm-working-dir: src/Umbraco.Community.SimpleTrees.Client
2121
npm-enabled: true
2222
npm-version: "22.x"
23-
umbraco-version: 17
24-
dotnet-version: "10"
2523
- name: Release
26-
uses: jcdcdev/jcdcdev.Umbraco.GitHub.Release@main
24+
uses: jcdcdev/jcdcdev.Umbraco.GitHub.Release@v17
2725
with:
2826
artifact-name: ${{ steps.build.outputs.artifact-name }}
2927
version: ${{ steps.build.outputs.version }}

src/Umbraco.Community.SimpleTrees.TestSite/Umbraco.Community.SimpleTrees.TestSite.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="NuGet.Protocol" Version="6.14.0" />
10-
<PackageReference Include="Umbraco.Cms" Version="17.0.0-rc1" />
11-
<PackageReference Include="uSync" Version="17.0.0-rc1" />
9+
<PackageReference Include="NuGet.Protocol" Version="7.0.1" />
10+
<PackageReference Include="Umbraco.Cms" Version="17.0.0-rc4" />
11+
<PackageReference Include="uSync" Version="17.0.0-rc4" />
1212
</ItemGroup>
1313

1414
<ItemGroup>
@@ -17,8 +17,8 @@
1717

1818
<ItemGroup>
1919
<!-- Opt-in to app-local ICU to ensure consistent globalization APIs across different platforms -->
20-
<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3"/>
21-
<RuntimeHostConfigurationOption Include="System.Globalization.AppLocalIcu" Value="72.1.0.3" Condition="$(RuntimeIdentifier.StartsWith('linux')) or $(RuntimeIdentifier.StartsWith('win')) or ('$(RuntimeIdentifier)' == '' and !$([MSBuild]::IsOSPlatform('osx')))"/>
20+
<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3" />
21+
<RuntimeHostConfigurationOption Include="System.Globalization.AppLocalIcu" Value="72.1.0.3" Condition="$(RuntimeIdentifier.StartsWith('linux')) or $(RuntimeIdentifier.StartsWith('win')) or ('$(RuntimeIdentifier)' == '' and !$([MSBuild]::IsOSPlatform('osx')))" />
2222
</ItemGroup>
2323

2424
<PropertyGroup>

src/Umbraco.Community.SimpleTrees.TestSite/packages.lock.json

Lines changed: 362 additions & 347 deletions
Large diffs are not rendered by default.

src/Umbraco.Community.SimpleTrees/Core/Composing/ConfigApiSwaggerGenOptions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Microsoft.Extensions.DependencyInjection;
22
using Microsoft.Extensions.Options;
3-
using Microsoft.OpenApi.Models;
3+
using Microsoft.OpenApi;
44
using Swashbuckle.AspNetCore.SwaggerGen;
55

66
namespace Umbraco.Community.SimpleTrees.Core.Composing;

src/Umbraco.Community.SimpleTrees/Umbraco.Community.SimpleTrees.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
</PropertyGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="Umbraco.Cms.Api.Common" Version="17.0.0-rc1" />
27-
<PackageReference Include="Umbraco.Cms.Api.Management" Version="17.0.0-rc1" />
28-
<PackageReference Include="Umbraco.Cms.Web.Website" Version="17.0.0-rc1" />
29-
<PackageReference Include="jcdcdev.Umbraco.Core" Version="17.0.0-alpha0003" />
26+
<PackageReference Include="Umbraco.Cms.Api.Common" Version="17.0.0-rc4" />
27+
<PackageReference Include="Umbraco.Cms.Api.Management" Version="17.0.0-rc4" />
28+
<PackageReference Include="Umbraco.Cms.Web.Website" Version="17.0.0-rc4" />
29+
<PackageReference Include="jcdcdev.Umbraco.Core" Version="17.0.0-alpha.8" />
3030
</ItemGroup>
3131

3232
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
@@ -40,9 +40,9 @@
4040
</PropertyGroup>
4141

4242
<ItemGroup>
43-
<None Include="..\..\docs\icon.png" Pack="true" PackagePath="images\icon.png"/>
44-
<None Include="..\..\docs\README_nuget.md" Pack="true" PackagePath="\"/>
45-
<EmbeddedResource Include="Views\Trees\ViewNotFound.cshtml"/>
43+
<None Include="..\..\docs\icon.png" Pack="true" PackagePath="images\icon.png" />
44+
<None Include="..\..\docs\README_nuget.md" Pack="true" PackagePath="\" />
45+
<EmbeddedResource Include="Views\Trees\ViewNotFound.cshtml" />
4646
</ItemGroup>
4747

4848
</Project>

src/Umbraco.Community.SimpleTrees/Web/Controllers/SimpleTreesTreeController.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
using Microsoft.AspNetCore.Http;
33
using Microsoft.AspNetCore.Mvc;
44
using Umbraco.Cms.Api.Common.ViewModels.Pagination;
5-
using Umbraco.Cms.Core.Models;
65
using Umbraco.Community.SimpleTrees.Core;
7-
using Umbraco.Community.SimpleTrees.Core.Models;
86
using Umbraco.Community.SimpleTrees.Web.Models;
97

108
namespace Umbraco.Community.SimpleTrees.Web.Controllers;

src/Umbraco.Community.SimpleTrees/Web/Controllers/SimpleTreesTreeItemController.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using Microsoft.AspNetCore.Mvc;
44
using Umbraco.Cms.Api.Common.ViewModels.Pagination;
55
using Umbraco.Community.SimpleTrees.Core;
6-
using Umbraco.Community.SimpleTrees.Core.Models;
76
using Umbraco.Community.SimpleTrees.Web.Models;
87

98
namespace Umbraco.Community.SimpleTrees.Web.Controllers;

0 commit comments

Comments
 (0)