Skip to content

Commit cdc3435

Browse files
jcdcdevjcdcdev
committed
+changelog-ignore: cleanup
1 parent f3f6790 commit cdc3435

File tree

104 files changed

+8777
-8699
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+8777
-8699
lines changed

‎src/.editorconfig‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
[*]
22
max_line_length = 200
3-
indent_style = tab
3+
indent_style = space
44
indent_size = 4
55
tab_width = 4
6+
insert_final_newline = true
7+
end_of_line = lf
8+
charset = utf-8
9+
trim_trailing_whitespace = true
610

711
# ReSharper properties
812
resharper_braces_redundant = false

‎src/TestSite.10/Composer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ public class Composer : IComposer
77
public void Compose(IUmbracoBuilder builder)
88
{
99
}
10-
}
10+
}

‎src/TestSite.10/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
1515
webBuilder.UseStaticWebAssets();
1616
webBuilder.UseStartup<Startup>();
1717
});
18-
}
18+
}

‎src/TestSite.10/Properties/launchSettings.json‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
{
2-
"$schema": "https://json.schemastore.org/launchsettings.json",
3-
"iisSettings": {
4-
"windowsAuthentication": false,
5-
"anonymousAuthentication": true,
6-
"iisExpress": {
7-
"applicationUrl": "http://localhost:16958",
8-
"sslPort": 44316
9-
}
10-
},
11-
"profiles": {
12-
"IIS Express": {
13-
"commandName": "IISExpress",
14-
"launchBrowser": true,
15-
"environmentVariables": {
16-
"ASPNETCORE_ENVIRONMENT": "Development"
17-
}
18-
},
19-
"Umbraco.Web.UI": {
20-
"commandName": "Project",
21-
"dotnetRunMessages": true,
22-
"launchBrowser": true,
23-
"applicationUrl": "https://localhost:44316;http://localhost:16958",
24-
"environmentVariables": {
25-
"ASPNETCORE_ENVIRONMENT": "Development"
26-
}
27-
}
28-
}
2+
"$schema": "https://json.schemastore.org/launchsettings.json",
3+
"iisSettings": {
4+
"windowsAuthentication": false,
5+
"anonymousAuthentication": true,
6+
"iisExpress": {
7+
"applicationUrl": "http://localhost:16958",
8+
"sslPort": 44316
9+
}
10+
},
11+
"profiles": {
12+
"IIS Express": {
13+
"commandName": "IISExpress",
14+
"launchBrowser": true,
15+
"environmentVariables": {
16+
"ASPNETCORE_ENVIRONMENT": "Development"
17+
}
18+
},
19+
"Umbraco.Web.UI": {
20+
"commandName": "Project",
21+
"dotnetRunMessages": true,
22+
"launchBrowser": true,
23+
"applicationUrl": "https://localhost:44316;http://localhost:16958",
24+
"environmentVariables": {
25+
"ASPNETCORE_ENVIRONMENT": "Development"
26+
}
27+
}
28+
}
2929
}

‎src/TestSite.10/Startup.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,4 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
6161
u.UseWebsiteEndpoints();
6262
});
6363
}
64-
}
64+
}

‎src/TestSite.10/TestSite.10.csproj‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
4-
<ImplicitUsings>enable</ImplicitUsings>
5-
<Nullable>enable</Nullable>
6-
<RootNamespace>TestSite.Ten</RootNamespace>
7-
</PropertyGroup>
2+
<PropertyGroup>
3+
<TargetFramework>net6.0</TargetFramework>
4+
<ImplicitUsings>enable</ImplicitUsings>
5+
<Nullable>enable</Nullable>
6+
<RootNamespace>TestSite.Ten</RootNamespace>
7+
</PropertyGroup>
88

9-
<ItemGroup>
10-
<PackageReference Include="Umbraco.Cms" Version="10.4.0"/>
11-
<PackageReference Include="uSync" Version="10.7.1"/>
12-
</ItemGroup>
9+
<ItemGroup>
10+
<PackageReference Include="Umbraco.Cms" Version="10.4.0"/>
11+
<PackageReference Include="uSync" Version="10.7.1"/>
12+
</ItemGroup>
1313

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

20-
<ItemGroup>
21-
<Content Update="appsettings.*.json">
22-
<DependentUpon>appsettings.json</DependentUpon>
23-
</Content>
24-
</ItemGroup>
20+
<ItemGroup>
21+
<Content Update="appsettings.*.json">
22+
<DependentUpon>appsettings.json</DependentUpon>
23+
</Content>
24+
</ItemGroup>
2525

26-
<ItemGroup>
27-
<ProjectReference Include="..\jcdcdev.Umbraco.ReadingTime\jcdcdev.Umbraco.ReadingTime.csproj"/>
28-
</ItemGroup>
26+
<ItemGroup>
27+
<ProjectReference Include="..\jcdcdev.Umbraco.ReadingTime\jcdcdev.Umbraco.ReadingTime.csproj"/>
28+
</ItemGroup>
2929

30-
<PropertyGroup>
31-
<!-- Razor files are needed for the backoffice to work correctly -->
32-
<CopyRazorGenerateFilesToPublishDirectory>true</CopyRazorGenerateFilesToPublishDirectory>
33-
</PropertyGroup>
30+
<PropertyGroup>
31+
<!-- Razor files are needed for the backoffice to work correctly -->
32+
<CopyRazorGenerateFilesToPublishDirectory>true</CopyRazorGenerateFilesToPublishDirectory>
33+
</PropertyGroup>
3434

35-
<PropertyGroup>
36-
<!-- Remove RazorCompileOnBuild and RazorCompileOnPublish when not using ModelsMode InMemoryAuto -->
37-
<RazorCompileOnBuild>false</RazorCompileOnBuild>
38-
<RazorCompileOnPublish>false</RazorCompileOnPublish>
39-
</PropertyGroup>
35+
<PropertyGroup>
36+
<!-- Remove RazorCompileOnBuild and RazorCompileOnPublish when not using ModelsMode InMemoryAuto -->
37+
<RazorCompileOnBuild>false</RazorCompileOnBuild>
38+
<RazorCompileOnPublish>false</RazorCompileOnPublish>
39+
</PropertyGroup>
4040

4141
</Project>

‎src/TestSite.10/Views/Partials/blockgrid/Components/umbBlockGridDemoHeadlineBlock.cshtml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@using Umbraco.Extensions
2-
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridItem>
1+
@inherits UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridItem>
32

43
<h2 style="padding: 20px">@Model.Content.Value("headline")</h2>

‎src/TestSite.10/Views/Partials/blockgrid/Components/umbBlockGridDemoImageBlock.cshtml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
@using Umbraco.Extensions
2-
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridItem>
1+
@using Umbraco.Cms.Core.Models
2+
@inherits UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridItem>
33

44
@{
5-
var typedMediaPickerSingle = Model.Content.Value<Umbraco.Cms.Core.Models.MediaWithCrops>("image");
5+
var typedMediaPickerSingle = Model.Content.Value<MediaWithCrops>("image");
66
if (typedMediaPickerSingle != null)
77
{
88
<img src="@typedMediaPickerSingle.MediaUrl()" style="object-fit:cover; width:100%; height:100%;"/>
9-
} else {
9+
}
10+
else
11+
{
1012
<p>Missing image</p>
1113
}
1214
}

‎src/TestSite.10/Views/Partials/blockgrid/Components/umbBlockGridDemoRichTextBlock.cshtml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
@using Umbraco.Extensions
2-
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridItem>
1+
@inherits UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridItem>
32

43
<div style="padding: 20px">
5-
@Model.Content.Value("richText")
4+
@Model.Content.Value("richText")
65
</div>

‎src/TestSite.10/Views/Partials/blockgrid/Components/umbBlockGridDemoTwoColumnLayoutBlock.cshtml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
@using Umbraco.Extensions
2-
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridItem>
1+
@inherits UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridItem>
32

43
<div>
54
@await Html.GetBlockGridItemAreasHtmlAsync(Model)

0 commit comments

Comments
 (0)