Skip to content

Commit b5235a2

Browse files
committed
Merge branch 'develop' into feature/998
2 parents 143be72 + 6e46a05 commit b5235a2

39 files changed

Lines changed: 268 additions & 155 deletions

File tree

.github/workflows/cloudscribe-develop.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ name: cloudscribe-simplecontent-develop-nuget-build
66
on:
77
push:
88
branches: [ "develop" ]
9+
workflow_dispatch:
910
# pull_request:
1011
# branches: [ "develop" ]
1112

@@ -30,3 +31,9 @@ jobs:
3031
run: dotnet pack -c Release
3132
- name: Publish NuGet package
3233
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
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+
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
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\.Common")
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+
run: |
45+
PACKAGES=$(find . -name "*.nupkg" | grep -E "cloudscribe|sts\.Common")
46+
if [ -z "$PACKAGES" ]; then
47+
echo "No matching package found. Exiting."
48+
exit 1
49+
fi
50+
echo "Found packages: $PACKAGES"
51+
for PACKAGE in $PACKAGES; do
52+
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"
54+
done

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,18 @@ If you have questions, please visit our community forums https://www.cloudscribe
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

src/cloudscribe.ContentUtils/cloudscribe.ContentUtils.csproj

Lines changed: 2 additions & 2 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.1.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Razor">
1+
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
44
<Description>Bootstrap 3 pre-compiled views for cloudscribe Core and SimpleContent integration</Description>
5-
<Version>8.0.0</Version>
5+
<Version>8.1.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Razor">
1+
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
44
<Description>Bootstrap 4 pre-compiled views for cloudscribe Core and SimpleContent integration</Description>
5-
<Version>8.0.0</Version>
5+
<Version>8.1.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.0.3</Version>
5+
<Version>8.1.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: 10 additions & 10 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>integration library for integrating cloudscribe SimpleContent with cloudscribe Core multi-tenant web app foundation</Description>
5-
<Version>8.0.2</Version>
5+
<Version>8.1.0</Version>
66
<TargetFramework>net8.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;blog</PackageTags>
@@ -28,17 +28,17 @@
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="cloudscribe.Core.Models" Version="8.0.0" />
32-
<PackageReference Include="cloudscribe.Core.Identity" Version="8.0.0" />
33-
<PackageReference Include="cloudscribe.Core.Web" Version="8.0.0" />
34-
<PackageReference Include="cloudscribe.Web.Common" Version="8.0.0" />
35-
<PackageReference Include="cloudscribe.FileManager.Web" Version="8.0.0" />
36-
<PackageReference Include="cloudscribe.Syndication.Web" Version="8.0.0" />
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" />
3737

3838
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
3939
<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.0" />
40-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
41-
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
40+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
41+
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
4242
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
4343
</ItemGroup>
4444

src/cloudscribe.MetaWeblog/cloudscribe.MetaWeblog.csproj

Lines changed: 2 additions & 2 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>a re-useable implementation of the metaweblog api for asp.net core</Description>
5-
<Version>8.0.0</Version>
5+
<Version>8.1.0</Version>
66
<TargetFramework>net8.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<PackageTags>cloudscribe;metaweblog;api;asp.net core</PackageTags>

0 commit comments

Comments
 (0)