Skip to content

Commit 5e3f346

Browse files
JimKerslakeJimKerslake
committed
Merge branch 'develop' into feature/500
2 parents 9f2686a + f181ed2 commit 5e3f346

370 files changed

Lines changed: 26416 additions & 25405 deletions

File tree

Some content is hidden

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

‎.github/workflows/cloudscribe-develop.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# This workflow will build a .NET project
2+
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
3+
4+
name: cloudscribe-simplecontent-develop-nuget-build
5+
6+
on:
7+
push:
8+
branches: [ "develop" ]
9+
workflow_dispatch:
10+
# pull_request:
11+
# branches: [ "develop" ]
12+
13+
jobs:
14+
build:
15+
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- uses: actions/checkout@v4
20+
- name: Setup .NET
21+
uses: actions/setup-dotnet@v4
22+
with:
23+
dotnet-version: 8.0.x
24+
- name: Setup NuGet
25+
run: dotnet nuget add source ${{ secrets.NUGET_SOURCE_URL }} -u ${{secrets.NUGET_USERNAME }} -p ${{ secrets.NUGET_PASSWORD }} --store-password-in-clear-text
26+
- name: Restore dependencies
27+
run: dotnet restore
28+
- name: Build
29+
run: dotnet build -c Release
30+
- name: Create NuGet package
31+
run: dotnet pack -c Release
32+
- name: Publish NuGet package
33+
run: dotnet nuget push **/*.nupkg --source ${{ secrets.NUGET_SOURCE_URL }}
34+
- name: Remote Repository Dispatch
35+
uses: peter-evans/repository-dispatch@v3
36+
with:
37+
token: ${{ secrets.GHB_PAT }}
38+
repository: GreatHouseBarn/cloudscribe-testing
39+
event-type: cs.SimpleContent

‎.github/workflows/cloudscribe-master.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# This workflow will build a .NET project
2+
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
3+
4+
name: cloudscribe-simplecontent-master-nuget-build
5+
6+
on:
7+
push:
8+
branches: [ "master" ]
9+
# pull_request:
10+
# branches: [ "develop" ]
11+
12+
jobs:
13+
build:
14+
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- uses: actions/checkout@v4
19+
- name: Setup .NET
20+
uses: actions/setup-dotnet@v4
21+
with:
22+
dotnet-version: 8.0.x
23+
- name: Setup NuGet
24+
run: dotnet nuget add source ${{ secrets.NUGET_SOURCE_URL }} -u ${{secrets.NUGET_USERNAME }} -p ${{ secrets.NUGET_PASSWORD }} --store-password-in-clear-text
25+
- name: Restore dependencies
26+
run: dotnet restore
27+
- name: Build
28+
run: dotnet build -c Release
29+

‎.github/workflows/nuget-push-to-production.yml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: NuGet Push to Production - ESDM Nexus and nuget.org
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
push-nuget:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v4
11+
- name: Setup .NET
12+
uses: actions/setup-dotnet@v4
13+
with:
14+
dotnet-version: 8.0.x
15+
- name: Exit if the branch is not master
16+
run: |
17+
if [[ "${{ github.ref }}" != "refs/heads/master" ]]; then
18+
echo "Branch is not master, exiting."
19+
exit 1
20+
fi
21+
- name: Setup NuGet
22+
run: dotnet nuget add source ${{ secrets.NUGET_SOURCE_URL }} -u ${{ secrets.NUGET_USERNAME }} -p ${{ secrets.NUGET_PASSWORD }} --store-password-in-clear-text --name esdm-nuget-testing
23+
- name: Restore dependencies
24+
run: dotnet restore
25+
- name: Build
26+
run: dotnet build -c Release
27+
- name: Create NuGet package
28+
run: dotnet pack -c Release
29+
- name: Auth to other Nexus repo
30+
run: dotnet nuget add source ${{ secrets.ESDM_NUGET_HOSTED_URL }} -u ${{ secrets.NUGET_USERNAME }} -p ${{ secrets.NUGET_PASSWORD }} --store-password-in-clear-text --name esdm-nuget-hosted
31+
- name: Find and Push NuGet packages to Nexus
32+
run: |
33+
PACKAGES=$(find . -name "*.nupkg" | grep -E "cloudscribe|sts\.")
34+
if [ -z "$PACKAGES" ]; then
35+
echo "No matching package found. Exiting."
36+
exit 1
37+
fi
38+
echo "Found packages: $PACKAGES"
39+
for PACKAGE in $PACKAGES; do
40+
echo "Pushing $PACKAGE to Nexus"
41+
dotnet nuget push "$PACKAGE" --source esdm-nuget-hosted --skip-duplicate || echo "WARNING - skipping duplicate package: $PACKAGE"
42+
done
43+
- name: Find and Push NuGet packages to nuget.org
44+
env:
45+
NUGET_ORG_API_KEY: ${{ secrets.NUGET_ORG_API_KEY }}
46+
run: |
47+
PACKAGES=$(find . -name "*.nupkg" | grep -E "cloudscribe|sts\.Common")
48+
if [ -z "$PACKAGES" ]; then
49+
echo "No matching package found. Exiting."
50+
exit 1
51+
fi
52+
echo "Found packages: $PACKAGES"
53+
for PACKAGE in $PACKAGES; do
54+
echo "Pushing $PACKAGE to nuget.org"
55+
dotnet nuget push "$PACKAGE" --api-key "$NUGET_ORG_API_KEY" --source "https://api.nuget.org/v3/index.json" --skip-duplicate || { echo "WARNING - failed to upload package: $PACKAGE"; exit 1; }
56+
done

‎.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

‎NuGet.Config‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<packageSources>
4-
<!-- To inherit the global NuGet package sources remove the <clear/> line below -->
5-
<clear />
6-
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
7-
</packageSources>
83
</configuration>

‎README.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
11
# cloudscribe SimpleContent
22

3-
A simple, yet flexible content and blog engine for ASP.NET Core that can work with or without a database. This project has borrowed significantly from [Mads Kristensen's MiniBlog](https://github.com/madskristensen/MiniBlog) both for ideas and code but re-implemented and extended in the newer ASP.NET Core framework. Get the big picture at [cloudscribe.com](https://www.cloudscribe.com/docs/introduction)
3+
A simple, yet flexible content and blog engine for ASP.NET Core that can work with or without a database. This project has borrowed significantly from [Mads Kristensen's MiniBlog](https://github.com/madskristensen/MiniBlog) both for ideas and code but re-implemented and extended in the newer ASP.NET Core framework. Get the big picture at [cloudscribe.com](https://www.cloudscribe.com/docs/introduction)
44

55
[Documentation](https://www.cloudscribe.com/docs/cloudscribe-simplecontent) - in progress so check back often. Also note that cloudscribe SimpleContent is being used to make the documentation on [cloudscribe.com](https://www.cloudscribe.com)
66

77
If you have questions, please visit our community forums https://www.cloudscribe.com/forum
88

99
### Build Status
1010

11+
<!--
1112
| Windows | Linux |
1213
| ------------- | ------------- |
1314
| [![Build status](https://ci.appveyor.com/api/projects/status/d0900wcf3y7l7jup/branch/master?svg=true)](https://ci.appveyor.com/project/joeaudette/cloudscribe-simplecontent/branch/master) | [![Build Status](https://travis-ci.org/cloudscribe/cloudscribe.SimpleContent.svg?branch=master)](https://travis-ci.org/cloudscribe/cloudscribe.SimpleContent) |
1415
1516
[![Twitter URL](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/cloudscribeweb) [![Twitter Follow](https://img.shields.io/twitter/follow/cloudscribeweb.svg?style=social&label=Follow)](https://twitter.com/cloudscribeweb)
17+
-->
1618

19+
<!-- Making badges prettier: -->
20+
[![SimpleContent Build Devel](https://img.shields.io/github/actions/workflow/status/cloudscribe/cloudscribe.SimpleContent/cloudscribe-develop.yml?branch=develop&event=push&style=for-the-badge&label=🚀%20Develop%20Branch)](https://github.com/cloudscribe/cloudscribe.SimpleContent/actions/workflows/cloudscribe-develop.yml)
21+
22+
[![SimpleContent Build Master](https://img.shields.io/github/actions/workflow/status/cloudscribe/cloudscribe.SimpleContent/cloudscribe-master.yml?branch=master&event=push&style=for-the-badge&label=🚀%20Main%20Branch)](https://github.com/cloudscribe/cloudscribe.SimpleContent/actions/workflows/cloudscribe-master.yml)
1723
## Getting Started
1824

1925
See the [Introduction](https://www.cloudscribe.com/docs/introduction) to get the big picture and learn how to start new projects using our project template for Visual Studio or the .NET Core CLI

‎cloudscribe.SimpleContent.sln‎

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29209.152
3+
# Visual Studio Version 17
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: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<Description>Content utilities for html and markdown</Description>
5-
<Version>8.0.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.

0 commit comments

Comments
 (0)