Skip to content

Commit d5cfcab

Browse files
committed
Merge branch 'develop' into feature/summernote
2 parents 8cf5696 + 1f73bcf commit d5cfcab

35 files changed

Lines changed: 107 additions & 92 deletions

File tree

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
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
3131
- name: Find and Push NuGet packages to Nexus
3232
run: |
33-
PACKAGES=$(find . -name "*.nupkg" | grep -E "cloudscribe|sts\.Common")
33+
PACKAGES=$(find . -name "*.nupkg" | grep -E "cloudscribe|sts\.")
3434
if [ -z "$PACKAGES" ]; then
3535
echo "No matching package found. Exiting."
3636
exit 1
@@ -41,6 +41,8 @@ jobs:
4141
dotnet nuget push "$PACKAGE" --source esdm-nuget-hosted --skip-duplicate || echo "WARNING - skipping duplicate package: $PACKAGE"
4242
done
4343
- name: Find and Push NuGet packages to nuget.org
44+
env:
45+
NUGET_ORG_API_KEY: ${{ secrets.NUGET_ORG_API_KEY }}
4446
run: |
4547
PACKAGES=$(find . -name "*.nupkg" | grep -E "cloudscribe|sts\.Common")
4648
if [ -z "$PACKAGES" ]; then
@@ -50,5 +52,5 @@ jobs:
5052
echo "Found packages: $PACKAGES"
5153
for PACKAGE in $PACKAGES; do
5254
echo "Pushing $PACKAGE to nuget.org"
53-
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"
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; }
5456
done

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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

src/cloudscribe.ContentUtils/cloudscribe.ContentUtils.csproj

Lines changed: 1 addition & 1 deletion
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.1.0</Version>
5+
<Version>8.2.0</Version>
66
<TargetFramework>net8.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;blog,content</PackageTags>

src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap3/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap3.csproj

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

33
<PropertyGroup>
44
<Description>Bootstrap 3 pre-compiled views for cloudscribe Core and SimpleContent integration</Description>
5-
<Version>8.1.0</Version>
5+
<Version>8.2.0</Version>
66
<TargetFramework>net8.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>

src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap4/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap4.csproj

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

33
<PropertyGroup>
44
<Description>Bootstrap 4 pre-compiled views for cloudscribe Core and SimpleContent integration</Description>
5-
<Version>8.1.0</Version>
5+
<Version>8.2.0</Version>
66
<TargetFramework>net8.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>

src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5.csproj

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

33
<PropertyGroup>
44
<Description>Bootstrap 5 pre-compiled views for cloudscribe Core and SimpleContent integration</Description>
5-
<Version>8.1.0</Version>
5+
<Version>8.2.0</Version>
66
<TargetFramework>net8.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>

src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj

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

33
<PropertyGroup>
44
<Description>integration library for integrating cloudscribe SimpleContent with cloudscribe Core multi-tenant web app foundation</Description>
5-
<Version>8.1.0</Version>
5+
<Version>8.2.0</Version>
66
<TargetFramework>net8.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;blog</PackageTags>
@@ -28,12 +28,12 @@
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="cloudscribe.Core.Models" Version="8.1.0" />
32-
<PackageReference Include="cloudscribe.Core.Identity" Version="8.1.0" />
33-
<PackageReference Include="cloudscribe.Core.Web" Version="8.1.0" />
34-
<PackageReference Include="cloudscribe.Web.Common" Version="8.1.0" />
35-
<PackageReference Include="cloudscribe.FileManager.Web" Version="8.1.0" />
36-
<PackageReference Include="cloudscribe.Syndication.Web" Version="8.1.0" />
31+
<PackageReference Include="cloudscribe.Core.Models" Version="8.2.0" />
32+
<PackageReference Include="cloudscribe.Core.Identity" Version="8.2.0" />
33+
<PackageReference Include="cloudscribe.Core.Web" Version="8.2.0" />
34+
<PackageReference Include="cloudscribe.Web.Common" Version="8.2.0" />
35+
<PackageReference Include="cloudscribe.FileManager.Web" Version="8.2.0" />
36+
<PackageReference Include="cloudscribe.Syndication.Web" Version="8.2.0" />
3737

3838
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
3939
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.0" />

src/cloudscribe.MetaWeblog/cloudscribe.MetaWeblog.csproj

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

33
<PropertyGroup>
44
<Description>a re-useable implementation of the metaweblog api for asp.net core</Description>
5-
<Version>8.1.0</Version>
5+
<Version>8.2.0</Version>
66
<TargetFramework>net8.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;metaweblog;api;asp.net core</PackageTags>

src/cloudscribe.SimpleContent.CompiledViews.Bootstrap3/cloudscribe.SimpleContent.CompiledViews.Bootstrap3.csproj

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

33
<PropertyGroup>
44
<Description>Bootstrap 3 pre-compiled views for cloudscribe.SimpleContent.Web</Description>
5-
<Version>8.1.0</Version>
5+
<Version>8.2.0</Version>
66
<TargetFramework>net8.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>

src/cloudscribe.SimpleContent.CompiledViews.Bootstrap4/cloudscribe.SimpleContent.CompiledViews.Bootstrap4.csproj

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

33
<PropertyGroup>
44
<Description>Bootstrap 4 pre-compiled views for cloudscribe.SimpleContent.Web</Description>
5-
<Version>8.1.0</Version>
5+
<Version>8.2.0</Version>
66
<TargetFramework>net8.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>

0 commit comments

Comments
 (0)