Skip to content

Commit 8052a77

Browse files
rickbutterfieldrickbutterfield
committed
Upgrade to 14.0.0-beta001
1 parent a2718f8 commit 8052a77

24 files changed

+3123
-1228
lines changed

‎src/Umbraco.Community.Sustainability.TestSite.14.x/Program.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111

1212
await app.BootUmbracoAsync();
1313

14+
#if (UseHttpsRedirect)
15+
app.UseHttpsRedirection();
16+
#endif
1417

1518
app.UseUmbraco()
1619
.WithMiddleware(u =>
@@ -20,7 +23,6 @@
2023
})
2124
.WithEndpoints(u =>
2225
{
23-
u.UseInstallerEndpoints();
2426
u.UseBackOfficeEndpoints();
2527
u.UseWebsiteEndpoints();
2628
});

‎src/Umbraco.Community.Sustainability.TestSite.14.x/Umbraco.Community.Sustainability.TestSite.14.x.csproj

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,35 @@
55
<Nullable>enable</Nullable>
66
<RootNamespace>Umbraco.Community.Sustainability.TestSite._14.x</RootNamespace>
77
</PropertyGroup>
8-
98
<ItemGroup>
10-
<PackageReference Include="Umbraco.Cms" Version="14.0.0--preview004" />
9+
<Content Include="App_Plugins\Umbraco.Community.Sustainability\js\resource-checker.js">
10+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
11+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
12+
</Content>
13+
<Content Include="App_Plugins\Umbraco.Community.Sustainability\js\sustainability-content-app.controller.js">
14+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
15+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
16+
</Content>
17+
<Content Include="App_Plugins\Umbraco.Community.Sustainability\js\sustainability.resource.js">
18+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
19+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
20+
</Content>
21+
<Content Include="App_Plugins\Umbraco.Community.Sustainability\lang\en.xml">
22+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
23+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
24+
</Content>
25+
<Content Include="App_Plugins\Umbraco.Community.Sustainability\package.manifest">
26+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
27+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
28+
</Content>
29+
<Content Include="App_Plugins\Umbraco.Community.Sustainability\views\sustainability-content-app.html">
30+
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
31+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
32+
</Content>
33+
</ItemGroup>
34+
35+
<ItemGroup>
36+
<PackageReference Include="Umbraco.Cms" Version="14.0.0-beta001" />
1137
</ItemGroup>
1238

1339
<ItemGroup>

‎src/Umbraco.Community.Sustainability.sln

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1313
EndProject
1414
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Community.Sustainability", "Umbraco.Community.Sustainability\Umbraco.Community.Sustainability.csproj", "{17B7D450-722D-4E4E-8E87-FD05BFA942B5}"
1515
EndProject
16-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Community.Sustainability.TestSite.10.x", "Umbraco.Community.Sustainability.TestSite.10.x\Umbraco.Community.Sustainability.TestSite.10.x.csproj", "{7F0CC3F5-4BBE-448F-9E21-EA4DCD863AF6}"
17-
EndProject
18-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Community.Sustainability.TestSite.11.x", "Umbraco.Community.Sustainability.TestSite.11.x\Umbraco.Community.Sustainability.TestSite.11.x.csproj", "{C54C6687-D36A-43A7-9A13-7256FFE79446}"
19-
EndProject
20-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Community.Sustainability.TestSite.12.x", "Umbraco.Community.Sustainability.TestSite.12.x\Umbraco.Community.Sustainability.TestSite.12.x.csproj", "{A085C0AB-D095-493F-89F8-F72C8F88876C}"
21-
EndProject
22-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Community.Sustainability.TestSite.13.x", "Umbraco.Community.Sustainability.TestSite.13.x\Umbraco.Community.Sustainability.TestSite.13.x.csproj", "{525F9B01-F7E8-43F5-A0F1-2581A12E9D5B}"
23-
EndProject
2416
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Community.Sustainability.TestSite.14.x", "Umbraco.Community.Sustainability.TestSite.14.x\Umbraco.Community.Sustainability.TestSite.14.x.csproj", "{26617F66-02C5-4EB4-B358-1683B1E7E04A}"
2517
EndProject
2618
Global
@@ -33,22 +25,6 @@ Global
3325
{17B7D450-722D-4E4E-8E87-FD05BFA942B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
3426
{17B7D450-722D-4E4E-8E87-FD05BFA942B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
3527
{17B7D450-722D-4E4E-8E87-FD05BFA942B5}.Release|Any CPU.Build.0 = Release|Any CPU
36-
{7F0CC3F5-4BBE-448F-9E21-EA4DCD863AF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37-
{7F0CC3F5-4BBE-448F-9E21-EA4DCD863AF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
38-
{7F0CC3F5-4BBE-448F-9E21-EA4DCD863AF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
39-
{7F0CC3F5-4BBE-448F-9E21-EA4DCD863AF6}.Release|Any CPU.Build.0 = Release|Any CPU
40-
{C54C6687-D36A-43A7-9A13-7256FFE79446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41-
{C54C6687-D36A-43A7-9A13-7256FFE79446}.Debug|Any CPU.Build.0 = Debug|Any CPU
42-
{C54C6687-D36A-43A7-9A13-7256FFE79446}.Release|Any CPU.ActiveCfg = Release|Any CPU
43-
{C54C6687-D36A-43A7-9A13-7256FFE79446}.Release|Any CPU.Build.0 = Release|Any CPU
44-
{A085C0AB-D095-493F-89F8-F72C8F88876C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45-
{A085C0AB-D095-493F-89F8-F72C8F88876C}.Debug|Any CPU.Build.0 = Debug|Any CPU
46-
{A085C0AB-D095-493F-89F8-F72C8F88876C}.Release|Any CPU.ActiveCfg = Release|Any CPU
47-
{A085C0AB-D095-493F-89F8-F72C8F88876C}.Release|Any CPU.Build.0 = Release|Any CPU
48-
{525F9B01-F7E8-43F5-A0F1-2581A12E9D5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49-
{525F9B01-F7E8-43F5-A0F1-2581A12E9D5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
50-
{525F9B01-F7E8-43F5-A0F1-2581A12E9D5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
51-
{525F9B01-F7E8-43F5-A0F1-2581A12E9D5B}.Release|Any CPU.Build.0 = Release|Any CPU
5228
{26617F66-02C5-4EB4-B358-1683B1E7E04A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5329
{26617F66-02C5-4EB4-B358-1683B1E7E04A}.Debug|Any CPU.Build.0 = Debug|Any CPU
5430
{26617F66-02C5-4EB4-B358-1683B1E7E04A}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎src/Umbraco.Community.Sustainability/ConfigureSwaggerGenOptions.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
#if NET8_0
2+
using Asp.Versioning;
23
using Microsoft.Extensions.DependencyInjection;
34
using Microsoft.Extensions.Options;
45
using Microsoft.OpenApi.Models;
56
using Swashbuckle.AspNetCore.SwaggerGen;
7+
using Umbraco.Cms.Api.Common.OpenApi;
68

79
namespace Umbraco.Community.Sustainability
810
{
911
public class ConfigureSwaggerGenOptions : IConfigureOptions<SwaggerGenOptions>
1012
{
1113
public void Configure(SwaggerGenOptions options)
1214
{
15+
options.CustomOperationIds(e => $"{e.ActionDescriptor.RouteValues["action"]}");
16+
1317
options.SwaggerDoc(
1418
"sustainability",
1519
new OpenApiInfo

‎src/Umbraco.Community.Sustainability/Controllers/SustainabilityController.cs

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

‎src/Umbraco.Community.Sustainability/Controllers/SustainabilityWorkspaceControllerBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Umbraco.Community.Sustainability.Controllers
99
{
1010
[ApiController]
1111
[BackOfficeRoute("sustainability/api/v{version:apiVersion}")]
12-
[Authorize(Policy = "New" + AuthorizationPolicies.BackOfficeAccess)]
12+
[Authorize(Policy = AuthorizationPolicies.BackOfficeAccess)]
1313
[MapToApi("sustainability")]
1414
public class SustainabilityWorkspaceControllerBase : Controller
1515
{ }

‎src/Umbraco.Community.Sustainability/Umbraco.Community.Sustainability.csproj

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0</TargetFrameworks>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
<StaticWebAssetBasePath>/</StaticWebAssetBasePath>
@@ -25,22 +25,8 @@
2525

2626
<ItemGroup>
2727
<PackageReference Include="Microsoft.Playwright" Version="1.40.0" />
28-
</ItemGroup>
29-
30-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
31-
<PackageReference Include="Umbraco.Cms.Web.Website" Version="[10.0.0, 11.0.0)" />
32-
<PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="[10.0.0, 11.0.0)" />
33-
</ItemGroup>
34-
35-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
36-
<PackageReference Include="Umbraco.Cms.Web.Website" Version="[11.0.0, 13.0.0)" />
37-
<PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="[11.0.0, 13.0.0)" />
38-
</ItemGroup>
39-
40-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
41-
<PackageReference Include="Umbraco.Cms.Web.Website" Version="[13.0.0, 15.0.0)" />
42-
<PackageReference Include="Umbraco.Cms.Api.Common" Version="[13.0.0, 15.0.0)" />
43-
<PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="[13.0.0, 15.0.0)" />
28+
<PackageReference Include="Umbraco.Cms.Web.Website" Version="14.0.0-beta001" />
29+
<PackageReference Include="Umbraco.Cms.Api.Common" Version="14.0.0-beta001" />
4430
</ItemGroup>
4531

4632
<ItemGroup>

‎src/Umbraco.Community.Sustainability/Umbraco.Community.Sustainability.sln

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ VisualStudioVersion = 17.5.002.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Community.Sustainability", "Umbraco.Community.Sustainability.csproj", "{CB928458-2D0C-48BB-B744-15730CB73FFD}"
77
EndProject
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Community.Sustainability.TestSite.14.x", "..\Umbraco.Community.Sustainability.TestSite.14.x\Umbraco.Community.Sustainability.TestSite.14.x.csproj", "{01CD44CF-26C6-4D2F-B5D5-37448D815B2F}"
9+
EndProject
810
Global
911
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1012
Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
1517
{CB928458-2D0C-48BB-B744-15730CB73FFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
1618
{CB928458-2D0C-48BB-B744-15730CB73FFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
1719
{CB928458-2D0C-48BB-B744-15730CB73FFD}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{01CD44CF-26C6-4D2F-B5D5-37448D815B2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{01CD44CF-26C6-4D2F-B5D5-37448D815B2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{01CD44CF-26C6-4D2F-B5D5-37448D815B2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{01CD44CF-26C6-4D2F-B5D5-37448D815B2F}.Release|Any CPU.Build.0 = Release|Any CPU
1824
EndGlobalSection
1925
GlobalSection(SolutionProperties) = preSolution
2026
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)