Skip to content

Commit e799123

Browse files
JimKerslakeJimKerslake
authored
Merge pull request #658 from cloudscribe/conflict_resolve
v8.4
2 parents 87a1de4 + 38dbe8c commit e799123

File tree

268 files changed

+19540
-28777
lines changed

Some content is hidden

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

268 files changed

+19540
-28777
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ src/example.WebApp/wwwroot/s3/**
207207
src/cloudscribe.Core.Repositories.EF/appsettings.local.overrides.json
208208
src/cloudscribe.Logging.EF/appsettings.local.overrides.json
209209
**/dp_keys/**
210-
src/cloudscribe.MetaWeblog/README.md
211210
samples/simpleauthnodb/.vs/**
212211
src/cloudscribe.SimpleContent.Storage.EF/appsettings.local.overrides.json
213212
src/cloudscribe.SimpleContent.Storage.EFCore/appsettings.local.overrides.json

‎cloudscribe.SimpleContent.sln‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
4-
VisualStudioVersion = 17.12.35527.113 d17.12
4+
VisualStudioVersion = 17.12.35527.113
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5243DE57-7C89-4208-8876-405E13605D16}"
77
EndProject
@@ -23,20 +23,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cloudscribe.SimpleContent.S
2323
EndProject
2424
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cloudscribe.SimpleContent.Storage.EFCore.MySQL", "src\cloudscribe.SimpleContent.Storage.EFCore.MySQL\cloudscribe.SimpleContent.Storage.EFCore.MySQL.csproj", "{4713D574-918D-4129-A11C-2287AE4B119F}"
2525
EndProject
26-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cloudscribe.SimpleContent.Storage.EFCore.pgsql", "src\cloudscribe.SimpleContent.Storage.EFCore.pgsql\cloudscribe.SimpleContent.Storage.EFCore.pgsql.csproj", "{194BE097-4347-4B9D-87C9-F3B13D337DA4}"
27-
EndProject
2826
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cloudscribe.SimpleContent.Storage.EFCore.SQLite", "src\cloudscribe.SimpleContent.Storage.EFCore.SQLite\cloudscribe.SimpleContent.Storage.EFCore.SQLite.csproj", "{CBB0F82E-371E-4F0C-8474-C1B7D30754A9}"
2927
EndProject
3028
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E9B2D007-5701-4DEB-AC64-A435D71AA05F}"
3129
EndProject
3230
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cloudscribe.SimpleContent.Web.Tests", "test\cloudscribe.SimpleContent.Web.Tests\cloudscribe.SimpleContent.Web.Tests.csproj", "{16735222-D50E-4535-A9BD-85EE05AA5308}"
3331
EndProject
34-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap3", "src\cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap3\cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap3.csproj", "{94D5F158-FC61-4548-984C-786369AC519F}"
35-
EndProject
3632
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap4", "src\cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap4\cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap4.csproj", "{AD0BEF33-2C26-4ABB-BD71-9BF9E46A7DB4}"
3733
EndProject
38-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cloudscribe.SimpleContent.CompiledViews.Bootstrap3", "src\cloudscribe.SimpleContent.CompiledViews.Bootstrap3\cloudscribe.SimpleContent.CompiledViews.Bootstrap3.csproj", "{7F5B360A-789D-4428-8CE5-ECFD721AAE1A}"
39-
EndProject
4034
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cloudscribe.SimpleContent.CompiledViews.Bootstrap4", "src\cloudscribe.SimpleContent.CompiledViews.Bootstrap4\cloudscribe.SimpleContent.CompiledViews.Bootstrap4.csproj", "{20ECAB1E-CF0B-4901-893B-ADF3C99C2093}"
4135
EndProject
4236
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "cloudscribe.SimpleContent.ContentTemplates.Bootstrap4", "src\cloudscribe.SimpleContent.ContentTemplates.Bootstrap4\cloudscribe.SimpleContent.ContentTemplates.Bootstrap4.csproj", "{C5A157C3-8A3D-467D-8D5A-52EA1A9297C6}"
@@ -99,10 +93,6 @@ Global
9993
{4713D574-918D-4129-A11C-2287AE4B119F}.Debug|Any CPU.Build.0 = Debug|Any CPU
10094
{4713D574-918D-4129-A11C-2287AE4B119F}.Release|Any CPU.ActiveCfg = Release|Any CPU
10195
{4713D574-918D-4129-A11C-2287AE4B119F}.Release|Any CPU.Build.0 = Release|Any CPU
102-
{194BE097-4347-4B9D-87C9-F3B13D337DA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
103-
{194BE097-4347-4B9D-87C9-F3B13D337DA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
104-
{194BE097-4347-4B9D-87C9-F3B13D337DA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
105-
{194BE097-4347-4B9D-87C9-F3B13D337DA4}.Release|Any CPU.Build.0 = Release|Any CPU
10696
{CBB0F82E-371E-4F0C-8474-C1B7D30754A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10797
{CBB0F82E-371E-4F0C-8474-C1B7D30754A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
10898
{CBB0F82E-371E-4F0C-8474-C1B7D30754A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -111,18 +101,10 @@ Global
111101
{16735222-D50E-4535-A9BD-85EE05AA5308}.Debug|Any CPU.Build.0 = Debug|Any CPU
112102
{16735222-D50E-4535-A9BD-85EE05AA5308}.Release|Any CPU.ActiveCfg = Release|Any CPU
113103
{16735222-D50E-4535-A9BD-85EE05AA5308}.Release|Any CPU.Build.0 = Release|Any CPU
114-
{94D5F158-FC61-4548-984C-786369AC519F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
115-
{94D5F158-FC61-4548-984C-786369AC519F}.Debug|Any CPU.Build.0 = Debug|Any CPU
116-
{94D5F158-FC61-4548-984C-786369AC519F}.Release|Any CPU.ActiveCfg = Release|Any CPU
117-
{94D5F158-FC61-4548-984C-786369AC519F}.Release|Any CPU.Build.0 = Release|Any CPU
118104
{AD0BEF33-2C26-4ABB-BD71-9BF9E46A7DB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
119105
{AD0BEF33-2C26-4ABB-BD71-9BF9E46A7DB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
120106
{AD0BEF33-2C26-4ABB-BD71-9BF9E46A7DB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
121107
{AD0BEF33-2C26-4ABB-BD71-9BF9E46A7DB4}.Release|Any CPU.Build.0 = Release|Any CPU
122-
{7F5B360A-789D-4428-8CE5-ECFD721AAE1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
123-
{7F5B360A-789D-4428-8CE5-ECFD721AAE1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
124-
{7F5B360A-789D-4428-8CE5-ECFD721AAE1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
125-
{7F5B360A-789D-4428-8CE5-ECFD721AAE1A}.Release|Any CPU.Build.0 = Release|Any CPU
126108
{20ECAB1E-CF0B-4901-893B-ADF3C99C2093}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
127109
{20ECAB1E-CF0B-4901-893B-ADF3C99C2093}.Debug|Any CPU.Build.0 = Debug|Any CPU
128110
{20ECAB1E-CF0B-4901-893B-ADF3C99C2093}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -177,12 +159,9 @@ Global
177159
{AC7D7A37-B684-4F02-A725-1625E96DE2B8} = {5243DE57-7C89-4208-8876-405E13605D16}
178160
{B23CA546-4B27-472F-B962-7E2C981CE89C} = {5243DE57-7C89-4208-8876-405E13605D16}
179161
{4713D574-918D-4129-A11C-2287AE4B119F} = {5243DE57-7C89-4208-8876-405E13605D16}
180-
{194BE097-4347-4B9D-87C9-F3B13D337DA4} = {5243DE57-7C89-4208-8876-405E13605D16}
181162
{CBB0F82E-371E-4F0C-8474-C1B7D30754A9} = {5243DE57-7C89-4208-8876-405E13605D16}
182163
{16735222-D50E-4535-A9BD-85EE05AA5308} = {E9B2D007-5701-4DEB-AC64-A435D71AA05F}
183-
{94D5F158-FC61-4548-984C-786369AC519F} = {5243DE57-7C89-4208-8876-405E13605D16}
184164
{AD0BEF33-2C26-4ABB-BD71-9BF9E46A7DB4} = {5243DE57-7C89-4208-8876-405E13605D16}
185-
{7F5B360A-789D-4428-8CE5-ECFD721AAE1A} = {5243DE57-7C89-4208-8876-405E13605D16}
186165
{20ECAB1E-CF0B-4901-893B-ADF3C99C2093} = {5243DE57-7C89-4208-8876-405E13605D16}
187166
{C5A157C3-8A3D-467D-8D5A-52EA1A9297C6} = {5243DE57-7C89-4208-8876-405E13605D16}
188167
{76A12B64-BF45-464F-8B23-1AEBF9427E9B} = {5243DE57-7C89-4208-8876-405E13605D16}

‎src/cloudscribe.ContentUtils/README.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# cloudscribe.ContentUtils
2+
3+
[![NuGet](https://img.shields.io/nuget/v/cloudscribe.ContentUtils.svg)](https://www.nuget.org/packages/cloudscribe.ContentUtils)
4+
[![License: Apache-2.0](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
5+
6+
Utilities for content management and manipulation in cloudscribe projects.
7+
8+
## Installation
9+
10+
```shell
11+
Install-Package cloudscribe.ContentUtils
12+
```
13+
14+
## Usage
15+
16+
Add as a dependency to your .NET 8.0 project and use the provided utilities for content handling.
17+
18+
## Contributing
19+
20+
Contributions are welcome! Please see the [contributing guidelines](https://github.com/cloudscribe/cloudscribe.SimpleContent/blob/main/CONTRIBUTING.md).
21+
22+
## License
23+
24+
This project is licensed under the Apache 2.0 License - see the [LICENSE](https://github.com/cloudscribe/cloudscribe.SimpleContent/blob/main/LICENSE) file for details.

‎src/cloudscribe.ContentUtils/cloudscribe.ContentUtils.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Content utilities for html and markdown</Description>
5-
<Version>8.3.0</Version>
5+
<Version>8.4.0</Version>
66
<TargetFramework>net8.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;blog,content</PackageTags>
@@ -11,6 +11,7 @@
1111
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
1212
<RepositoryUrl>https://github.com/cloudscribe/cloudscribe.SimpleContent.git</RepositoryUrl>
1313
<RepositoryType>git</RepositoryType>
14+
<PackageReadmeFile>README.md</PackageReadmeFile>
1415
</PropertyGroup>
1516

1617
<ItemGroup>
@@ -21,5 +22,7 @@
2122
<PackageReference Include="cloudscribe.HtmlAgilityPack" Version="1.0.1" />
2223
<PackageReference Include="Markdig" Version="0.37.0" />
2324
</ItemGroup>
24-
25+
<ItemGroup>
26+
<None Include="README.md" Pack="true" PackagePath="/" />
27+
</ItemGroup>
2528
</Project>

‎src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap3/Views/Blog/BlogMetaPartial.cshtml‎

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

‎src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap3/Views/ContentSettings/CdnUrlPartial.cshtml‎

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

‎src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap3/Views/ContentSettings/CommentSystemSettings.cshtml‎

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

0 commit comments

Comments
 (0)