From 0afc5f5c30dd0669c65c703cd9fb0b2a7c8489c6 Mon Sep 17 00:00:00 2001 From: jcdcdev Date: Sat, 6 Jan 2024 20:14:33 +0000 Subject: [PATCH 1/9] +changelog-ignore: generate icon changes --- .github/workflows/build.yml | 3 --- .github/workflows/generate-icon.yml | 10 ++++++++++ .github/workflows/release.yml | 3 --- src/jcdcdev.Umbraco.Core.sln | 1 + 4 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/generate-icon.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7d01e0e..b4a42e5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,8 +12,5 @@ jobs: project-name: 'jcdcdev.Umbraco.Core' project-path: './src/jcdcdev.Umbraco.Core/jcdcdev.Umbraco.Core.csproj' deploy: false - color-primary: '#5d584d' - color-secondary: '#73573c' - color-tertiary: '#aba377' secrets: nuget-api-key: ${{ secrets.NUGET_API_KEY }} \ No newline at end of file diff --git a/.github/workflows/generate-icon.yml b/.github/workflows/generate-icon.yml new file mode 100644 index 0000000..4752dde --- /dev/null +++ b/.github/workflows/generate-icon.yml @@ -0,0 +1,10 @@ +name: Build +on: + workflow_dispatch: +jobs: + build: + uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/generate-icon.yml@main + with: + color-primary: '#5d584d' + color-secondary: '#73573c' + color-tertiary: '#aba377' \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b7273be..3df9510 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,8 +13,5 @@ jobs: project-name: 'jcdcdev.Umbraco.Core' project-path: './src/jcdcdev.Umbraco.Core/jcdcdev.Umbraco.Core.csproj' deploy: true - color-primary: '#5d584d' - color-secondary: '#73573c' - color-tertiary: '#aba377' secrets: nuget-api-key: ${{ secrets.NUGET_API_KEY }} \ No newline at end of file diff --git a/src/jcdcdev.Umbraco.Core.sln b/src/jcdcdev.Umbraco.Core.sln index 07549d0..70d7d68 100644 --- a/src/jcdcdev.Umbraco.Core.sln +++ b/src/jcdcdev.Umbraco.Core.sln @@ -51,6 +51,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Github", "Github", "{5830A8 ProjectSection(SolutionItems) = preProject ..\.github\workflows\release.yml = ..\.github\workflows\release.yml ..\.github\workflows\build.yml = ..\.github\workflows\build.yml + ..\.github\workflows\generate-icon.yml = ..\.github\workflows\generate-icon.yml EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestSite.11", "TestSite.11\TestSite.11.csproj", "{F08FE559-22F7-4EA3-A389-8892F4E94D97}" From 79d5777745f9243f83d2f6f79e7d9b1c99a74505 Mon Sep 17 00:00:00 2001 From: jcdcdev Date: Sat, 6 Jan 2024 20:17:02 +0000 Subject: [PATCH 2/9] +changelog-ignore: include icon in source --- docs/icon.png | Bin 0 -> 54976 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs/icon.png diff --git a/docs/icon.png b/docs/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5cac36ecef0360be0b34ae480069b8584f3d7069 GIT binary patch literal 54976 zcmb4q2UnBL^L79+J|F=LpknAnkS3r&LPv$rtMnorY0`p(E+PWbf`s0rcj-+)1f)Zx zNUzcfMM9DO-ofAh1H5`Xo^$W+?Ck8!?94Tj5H%G!3bK1-AP|TGA^%hZ1R_}_{JVA) z_@bOSya@bv)l5XmH@z`81_WXRA)ZQWy-CJRdwLsscy9mM#=|rF8f;~r+|<8D zb%2#Ja6~*({O)e{pUhqEarC38dp2|me217V>dM0d8huAjo=Qii2v!4^9H9`44tv@u zj0Ra8i0KonB_iP6yQnuc)uJnPe)171Z9Ve$`nG#}SI$tP(T}bBj}(3h40!s6T>-fI z|NX=0!Hop9xld12Ie;;2)|S%Nb!$bY`U~X{R|B>qjX2ob%I}svz1|^;Jyxk}g)1l? zSA*qpOr3a#!E~it$!KUVYjG%)_}gcFCe9G3*^Sz)vohJ?P{eOu<+grx7GAxf(@6yh zUVQS!cgOUIKp=mZ^Fny6ErMf)>P{T)Z#WY^5S_dHWGyGt z#S#sXM;iwBYGLe|VEyOM)#? z@+HAjdtVTg4|;r~Jm*goIm*4NBf_EK&^xi2QUi5zWPeNtT#hRG&h&V_s^q<_}1XaJsA0oZrZX+!|dgcoa9QLw1|7Ln+FqN1dE)%Uv%_ ziP(0bL5*Wd1hnXedb-Yd;$u59RhUzIPjAI%i&1&l!+)FPeQtH}ndp^!K`-xQb&lFs zOV=TKCJK=AXW#cXWO&t=bH2-xttxgOuGE+*W#X?azF~}WOk!(%aeIldYhvtLRGq{k zPtYMHWM(gO%z2%f^!UERR4wwEyg~i+{u9AwAtXIvW@j`4A#8y-qO5V6#RrbPT&EyK z1jIf{in$sxOv=DA}F3EbPg%cx8R9n$V2!Eh> zu`<^`J^K;LUitv5s>V$dR~6JHJV3Kd+tyD|0uTjzj9X!sub-*K-a~*K1!;YjSy^p4 zPr{pAL^GGI`#)mXIe|E2<%83MeU=(;No4$2n{{FztB9jeVZ=E-V dl&us7O;ocs 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 Date: Sat, 6 Jan 2024 23:34:03 +0000 Subject: [PATCH 3/9] +changelog-ignore: update github actions --- .github/workflows/build.yml | 9 ++------- .github/workflows/release.yml | 16 +++++++++++----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b4a42e5..c05e5e9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,12 +5,7 @@ on: workflow_dispatch: jobs: build: - permissions: - contents: write - uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/build-release-template.yml@main + uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/build-template.yml@main with: project-name: 'jcdcdev.Umbraco.Core' - project-path: './src/jcdcdev.Umbraco.Core/jcdcdev.Umbraco.Core.csproj' - deploy: false - secrets: - nuget-api-key: ${{ secrets.NUGET_API_KEY }} \ No newline at end of file + project-path: './src/jcdcdev.Umbraco.Core/jcdcdev.Umbraco.Core.csproj' \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3df9510..1fd79df 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,13 +5,19 @@ on: types: [ closed ] workflow_dispatch: jobs: - build_release: - permissions: - contents: write - uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/build-release-template.yml@main + build: + uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/build-template.yml@main with: project-name: 'jcdcdev.Umbraco.Core' project-path: './src/jcdcdev.Umbraco.Core/jcdcdev.Umbraco.Core.csproj' - deploy: true + release: + needs: + - build + permissions: + contents: write + uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/release-template.yml@main + with: + artifact-name: ${{ needs.build.outputs.artifact-name }} + version: ${{ needs.build.outputs.version }} secrets: nuget-api-key: ${{ secrets.NUGET_API_KEY }} \ No newline at end of file From 83d0f5547077b269c9cec47bd2faff3d93a8a73e Mon Sep 17 00:00:00 2001 From: jcdcdev Date: Mon, 15 Jan 2024 18:20:40 +0000 Subject: [PATCH 4/9] +changelog-ignore: ci: dependabot --- .github/dependabot.yml | 11 +++++++++++ src/jcdcdev.Umbraco.Core.sln | 1 + 2 files changed, 12 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..4160b24 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +version: 2 +updates: + - package-ecosystem: "nuget" + directory: "/" + schedule: + interval: "daily" + time: "08:00" + ignore: + - dependency-name: "Umbraco.Cms.*" + - dependency-name: "Umbraco.Core.*" + target-branch: "dev" \ No newline at end of file diff --git a/src/jcdcdev.Umbraco.Core.sln b/src/jcdcdev.Umbraco.Core.sln index 70d7d68..359ee19 100644 --- a/src/jcdcdev.Umbraco.Core.sln +++ b/src/jcdcdev.Umbraco.Core.sln @@ -52,6 +52,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Github", "Github", "{5830A8 ..\.github\workflows\release.yml = ..\.github\workflows\release.yml ..\.github\workflows\build.yml = ..\.github\workflows\build.yml ..\.github\workflows\generate-icon.yml = ..\.github\workflows\generate-icon.yml + ..\.github\dependabot.yml = ..\.github\dependabot.yml EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestSite.11", "TestSite.11\TestSite.11.csproj", "{F08FE559-22F7-4EA3-A389-8892F4E94D97}" From acd40bb0dc7c1d8707c8b7125420eae3dd716511 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 18:38:12 +0000 Subject: [PATCH 5/9] build(deps): bump Microsoft.ICU.ICU4C.Runtime from 68.2.0.9 to 72.1.0.3 Bumps [Microsoft.ICU.ICU4C.Runtime](https://github.com/microsoft/icu) from 68.2.0.9 to 72.1.0.3. - [Release notes](https://github.com/microsoft/icu/releases) - [Changelog](https://github.com/microsoft/icu/blob/master/changelog.md) - [Commits](https://github.com/microsoft/icu/compare/v68.2.0.9...v72.1.0.3) --- updated-dependencies: - dependency-name: Microsoft.ICU.ICU4C.Runtime dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- src/TestSite.10/TestSite.10.csproj | 2 +- src/TestSite.11/TestSite.11.csproj | 2 +- src/TestSite.12/TestSite.12.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/TestSite.10/TestSite.10.csproj b/src/TestSite.10/TestSite.10.csproj index acda2a6..6c6df93 100644 --- a/src/TestSite.10/TestSite.10.csproj +++ b/src/TestSite.10/TestSite.10.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/TestSite.11/TestSite.11.csproj b/src/TestSite.11/TestSite.11.csproj index 8078b56..130012e 100644 --- a/src/TestSite.11/TestSite.11.csproj +++ b/src/TestSite.11/TestSite.11.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/TestSite.12/TestSite.12.csproj b/src/TestSite.12/TestSite.12.csproj index d6b89d4..ba41837 100644 --- a/src/TestSite.12/TestSite.12.csproj +++ b/src/TestSite.12/TestSite.12.csproj @@ -12,7 +12,7 @@ - + From 2d10083680b6769d23917ec18c390b1e3d3280c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Apr 2024 08:53:58 +0000 Subject: [PATCH 6/9] build(deps): bump Umbraco.Cms, Umbraco.Cms.Web.BackOffice, Umbraco.Cms.Web.Common and Umbraco.Cms.Web.Website Bumps [Umbraco.Cms](https://github.com/umbraco/Umbraco-CMS), Umbraco.Cms.Web.BackOffice, Umbraco.Cms.Web.Common and Umbraco.Cms.Web.Website. These dependencies needed to be updated together. Updates `Umbraco.Cms` from 10.4.0 to 10.8.5 - [Release notes](https://github.com/umbraco/Umbraco-CMS/releases) - [Commits](https://github.com/umbraco/Umbraco-CMS/compare/release-10.4.0...release-10.8.5) Updates `Umbraco.Cms.Web.BackOffice` from 10.4.0 to 10.8.5 Updates `Umbraco.Cms.Web.Common` from 10.4.0 to 10.8.5 Updates `Umbraco.Cms.Web.Website` from 10.4.0 to 10.8.5 --- updated-dependencies: - dependency-name: Umbraco.Cms dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: Umbraco.Cms.Web.BackOffice dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: Umbraco.Cms.Web.Common dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: Umbraco.Cms.Web.Website dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/TestSite.10/TestSite.10.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TestSite.10/TestSite.10.csproj b/src/TestSite.10/TestSite.10.csproj index acda2a6..ad0e640 100644 --- a/src/TestSite.10/TestSite.10.csproj +++ b/src/TestSite.10/TestSite.10.csproj @@ -7,7 +7,7 @@ - + From 493b3341ebd6e5ad606bd9338b48ad8296351df2 Mon Sep 17 00:00:00 2001 From: jcdcdev Date: Sun, 7 Apr 2024 22:57:05 +0100 Subject: [PATCH 7/9] chore: remove v11 test site --- src/TestSite.11/.gitignore | 479 ------------------ src/TestSite.11/Program.cs | 19 - .../Properties/launchSettings.json | 29 -- src/TestSite.11/Startup.cs | 65 --- src/TestSite.11/TestSite.11.csproj | 40 -- .../Views/Partials/blockgrid/area.cshtml | 10 - .../Views/Partials/blockgrid/areas.cshtml | 13 - .../Views/Partials/blockgrid/default.cshtml | 11 - .../Views/Partials/blockgrid/items.cshtml | 36 -- .../Views/Partials/blocklist/default.cshtml | 13 - .../Partials/grid/bootstrap3-fluid.cshtml | 106 ---- .../Views/Partials/grid/bootstrap3.cshtml | 112 ---- .../Views/Partials/grid/editors/base.cshtml | 27 - .../Views/Partials/grid/editors/embed.cshtml | 11 - .../Views/Partials/grid/editors/macro.cshtml | 15 - .../Views/Partials/grid/editors/media.cshtml | 64 --- .../Views/Partials/grid/editors/rte.cshtml | 13 - .../Partials/grid/editors/textstring.cshtml | 22 - src/TestSite.11/Views/_ViewImports.cshtml | 9 - src/TestSite.11/appsettings.Development.json | 44 -- src/TestSite.11/appsettings.json | 26 - src/TestSite.11/wwwroot/favicon.ico | Bin 15406 -> 0 bytes src/jcdcdev.Umbraco.Core.sln | 7 - 23 files changed, 1171 deletions(-) delete mode 100644 src/TestSite.11/.gitignore delete mode 100644 src/TestSite.11/Program.cs delete mode 100644 src/TestSite.11/Properties/launchSettings.json delete mode 100644 src/TestSite.11/Startup.cs delete mode 100644 src/TestSite.11/TestSite.11.csproj delete mode 100644 src/TestSite.11/Views/Partials/blockgrid/area.cshtml delete mode 100644 src/TestSite.11/Views/Partials/blockgrid/areas.cshtml delete mode 100644 src/TestSite.11/Views/Partials/blockgrid/default.cshtml delete mode 100644 src/TestSite.11/Views/Partials/blockgrid/items.cshtml delete mode 100644 src/TestSite.11/Views/Partials/blocklist/default.cshtml delete mode 100644 src/TestSite.11/Views/Partials/grid/bootstrap3-fluid.cshtml delete mode 100644 src/TestSite.11/Views/Partials/grid/bootstrap3.cshtml delete mode 100644 src/TestSite.11/Views/Partials/grid/editors/base.cshtml delete mode 100644 src/TestSite.11/Views/Partials/grid/editors/embed.cshtml delete mode 100644 src/TestSite.11/Views/Partials/grid/editors/macro.cshtml delete mode 100644 src/TestSite.11/Views/Partials/grid/editors/media.cshtml delete mode 100644 src/TestSite.11/Views/Partials/grid/editors/rte.cshtml delete mode 100644 src/TestSite.11/Views/Partials/grid/editors/textstring.cshtml delete mode 100644 src/TestSite.11/Views/_ViewImports.cshtml delete mode 100644 src/TestSite.11/appsettings.Development.json delete mode 100644 src/TestSite.11/appsettings.json delete mode 100644 src/TestSite.11/wwwroot/favicon.ico diff --git a/src/TestSite.11/.gitignore b/src/TestSite.11/.gitignore deleted file mode 100644 index 8bcfaae..0000000 --- a/src/TestSite.11/.gitignore +++ /dev/null @@ -1,479 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - -# User-specific files -*.rsuser -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Mono auto generated files -mono_crash.* - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -[Ww][Ii][Nn]32/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ -[Ll]ogs/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUnit -*.VisualState.xml -TestResult.xml -nunit-*.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# Tye -.tye/ - -# ASP.NET Scaffolding -ScaffoldingReadMe.txt - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*_wpftmp.csproj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Coverlet is a free, cross platform Code Coverage Tool -coverage*.json -coverage*.xml -coverage*.info - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# NuGet Symbol Packages -*.snupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx -*.appxbundle -*.appxupload - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# BeatPulse healthcheck temp database -healthchecksdb - -# Backup folder for Package Reference Convert tool in Visual Studio 2017 -MigrationBackup/ - -# Ionide (cross platform F# VS Code tools) working folder -.ionide/ - -# Fody - auto-generated XML schema -FodyWeavers.xsd - -## -## Visual studio for Mac -## - - -# globs -Makefile.in -*.userprefs -*.usertasks -config.make -config.status -aclocal.m4 -install-sh -autom4te.cache/ -*.tar.gz -tarballs/ -test-results/ - -# Mac bundle stuff -*.dmg -*.app - -# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore -# General -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore -# Windows thumbnail cache files -Thumbs.db -ehthumbs.db -ehthumbs_vista.db - -# Dump file -*.stackdump - -# Folder config file -[Dd]esktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msix -*.msm -*.msp - -# Windows shortcuts -*.lnk - -# JetBrains Rider -.idea/ -*.sln.iml - -## -## Visual Studio Code -## -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json - -## -## Umbraco CMS -## - -# JSON schema files for appsettings.json -appsettings-schema.json -appsettings-schema.*.json - -# Packages created from the backoffice (package.xml/package.zip) -/umbraco/Data/CreatedPackages/ - -# Temp folder containing Examine indexes, NuCache, MediaCache, etc. -/umbraco/Data/TEMP/ - -# SQLite database files -/umbraco/Data/*.sqlite.db -/umbraco/Data/*.sqlite.db-shm -/umbraco/Data/*.sqlite.db-wal - -# Log files -/umbraco/Logs/ - -# Media files -/wwwroot/media/ diff --git a/src/TestSite.11/Program.cs b/src/TestSite.11/Program.cs deleted file mode 100644 index 0a37b7f..0000000 --- a/src/TestSite.11/Program.cs +++ /dev/null @@ -1,19 +0,0 @@ -namespace TestSite.Eleven -{ - public class Program - { - public static void Main(string[] args) - => CreateHostBuilder(args) - .Build() - .Run(); - - public static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureUmbracoDefaults() - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStaticWebAssets(); - webBuilder.UseStartup(); - }); - } -} diff --git a/src/TestSite.11/Properties/launchSettings.json b/src/TestSite.11/Properties/launchSettings.json deleted file mode 100644 index 5e4321e..0000000 --- a/src/TestSite.11/Properties/launchSettings.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/launchsettings.json", - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:39997", - "sslPort": 44339 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "Umbraco.Web.UI": { - "commandName": "Project", - "dotnetRunMessages": true, - "launchBrowser": true, - "applicationUrl": "https://localhost:44339;http://localhost:39997", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} diff --git a/src/TestSite.11/Startup.cs b/src/TestSite.11/Startup.cs deleted file mode 100644 index 743f1a7..0000000 --- a/src/TestSite.11/Startup.cs +++ /dev/null @@ -1,65 +0,0 @@ -namespace TestSite.Eleven -{ - public class Startup - { - private readonly IWebHostEnvironment _env; - private readonly IConfiguration _config; - - /// - /// Initializes a new instance of the class. - /// - /// The web hosting environment. - /// The configuration. - /// - /// Only a few services are possible to be injected here https://github.com/dotnet/aspnetcore/issues/9337. - /// - public Startup(IWebHostEnvironment webHostEnvironment, IConfiguration config) - { - _env = webHostEnvironment ?? throw new ArgumentNullException(nameof(webHostEnvironment)); - _config = config ?? throw new ArgumentNullException(nameof(config)); - } - - /// - /// Configures the services. - /// - /// The services. - /// - /// This method gets called by the runtime. Use this method to add services to the container. - /// For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940. - /// - public void ConfigureServices(IServiceCollection services) - { - services.AddUmbraco(_env, _config) - .AddBackOffice() - .AddWebsite() - .AddComposers() - .Build(); - } - - /// - /// Configures the application. - /// - /// The application builder. - /// The web hosting environment. - public void Configure(IApplicationBuilder app, IWebHostEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - - app.UseUmbraco() - .WithMiddleware(u => - { - u.UseBackOffice(); - u.UseWebsite(); - }) - .WithEndpoints(u => - { - u.UseInstallerEndpoints(); - u.UseBackOfficeEndpoints(); - u.UseWebsiteEndpoints(); - }); - } - } -} diff --git a/src/TestSite.11/TestSite.11.csproj b/src/TestSite.11/TestSite.11.csproj deleted file mode 100644 index 8078b56..0000000 --- a/src/TestSite.11/TestSite.11.csproj +++ /dev/null @@ -1,40 +0,0 @@ - - - net7.0 - enable - enable - TestSite.Eleven - - - - - - - - - - - - - - - appsettings.json - - - - - - - - - - true - - - - - false - false - - - diff --git a/src/TestSite.11/Views/Partials/blockgrid/area.cshtml b/src/TestSite.11/Views/Partials/blockgrid/area.cshtml deleted file mode 100644 index 3614847..0000000 --- a/src/TestSite.11/Views/Partials/blockgrid/area.cshtml +++ /dev/null @@ -1,10 +0,0 @@ -@using Umbraco.Extensions -@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage - -
- @await Html.GetBlockGridItemsHtmlAsync(Model) -
diff --git a/src/TestSite.11/Views/Partials/blockgrid/areas.cshtml b/src/TestSite.11/Views/Partials/blockgrid/areas.cshtml deleted file mode 100644 index 30f987c..0000000 --- a/src/TestSite.11/Views/Partials/blockgrid/areas.cshtml +++ /dev/null @@ -1,13 +0,0 @@ -@using Umbraco.Extensions -@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage -@{ - if (Model?.Areas.Any() != true) { return; } -} - -
- @foreach (var area in Model.Areas) - { - @await Html.GetBlockGridItemAreaHtmlAsync(area) - } -
diff --git a/src/TestSite.11/Views/Partials/blockgrid/default.cshtml b/src/TestSite.11/Views/Partials/blockgrid/default.cshtml deleted file mode 100644 index e25839e..0000000 --- a/src/TestSite.11/Views/Partials/blockgrid/default.cshtml +++ /dev/null @@ -1,11 +0,0 @@ -@using Umbraco.Extensions -@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage -@{ - if (Model?.Any() != true) { return; } -} - -
- @await Html.GetBlockGridItemsHtmlAsync(Model) -
diff --git a/src/TestSite.11/Views/Partials/blockgrid/items.cshtml b/src/TestSite.11/Views/Partials/blockgrid/items.cshtml deleted file mode 100644 index 2703fa5..0000000 --- a/src/TestSite.11/Views/Partials/blockgrid/items.cshtml +++ /dev/null @@ -1,36 +0,0 @@ -@using Umbraco.Cms.Core.Models.Blocks -@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage> -@{ - if (Model?.Any() != true) { return; } -} - -
- @foreach (var item in Model) - { - -
- @{ - var partialViewName = "blockgrid/Components/" + item.Content.ContentType.Alias; - try - { - @await Html.PartialAsync(partialViewName, item) - } - catch (InvalidOperationException) - { -

- Could not render component of type: @(item.Content.ContentType.Alias) -
- This likely happened because the partial view @partialViewName could not be found. -

- } - } -
- } -
diff --git a/src/TestSite.11/Views/Partials/blocklist/default.cshtml b/src/TestSite.11/Views/Partials/blocklist/default.cshtml deleted file mode 100644 index accca2e..0000000 --- a/src/TestSite.11/Views/Partials/blocklist/default.cshtml +++ /dev/null @@ -1,13 +0,0 @@ -@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage -@{ - if (Model?.Any() != true) { return; } -} -
- @foreach (var block in Model) - { - if (block?.ContentUdi == null) { continue; } - var data = block.Content; - - @await Html.PartialAsync("blocklist/Components/" + data.ContentType.Alias, block) - } -
diff --git a/src/TestSite.11/Views/Partials/grid/bootstrap3-fluid.cshtml b/src/TestSite.11/Views/Partials/grid/bootstrap3-fluid.cshtml deleted file mode 100644 index b92734e..0000000 --- a/src/TestSite.11/Views/Partials/grid/bootstrap3-fluid.cshtml +++ /dev/null @@ -1,106 +0,0 @@ -@using System.Web -@using Microsoft.AspNetCore.Html -@using Newtonsoft.Json.Linq -@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage - -@* - Razor helpers located at the bottom of this file -*@ - -@if (Model is JObject && Model?.sections is not null) -{ - var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1; - -
- @if (oneColumn) - { - foreach (var section in Model.sections) - { -
- @foreach (var row in section.rows) - { - renderRow(row); - } -
- } - } - else - { -
- @foreach (var sec in Model.sections) - { -
-
- @foreach (var row in sec.rows) - { - renderRow(row); - } -
-
- } -
- } -
-} - -@functions{ - - private async Task renderRow(dynamic row) - { -
-
- @foreach (var area in row.areas) - { -
-
- @foreach (var control in area.controls) - { - if (control?.editor?.view != null) - { - @await Html.PartialAsync("grid/editors/base", (object)control) - } - } -
-
- } -
-
- } -} - -@functions{ - - public static HtmlString RenderElementAttributes(dynamic contentItem) - { - var attrs = new List(); - JObject cfg = contentItem.config; - - if (cfg != null) - { - foreach (JProperty property in cfg.Properties()) - { - var propertyValue = HttpUtility.HtmlAttributeEncode(property.Value.ToString()); - attrs.Add(property.Name + "=\"" + propertyValue + "\""); - } - } - - JObject style = contentItem.styles; - - if (style != null) { - var cssVals = new List(); - foreach (JProperty property in style.Properties()) - { - var propertyValue = property.Value.ToString(); - if (string.IsNullOrWhiteSpace(propertyValue) == false) - { - cssVals.Add(property.Name + ":" + propertyValue + ";"); - } - } - - if (cssVals.Any()) - attrs.Add("style='" + HttpUtility.HtmlAttributeEncode(string.Join(" ", cssVals)) + "'"); - } - - return new HtmlString(string.Join(" ", attrs)); - } -} diff --git a/src/TestSite.11/Views/Partials/grid/bootstrap3.cshtml b/src/TestSite.11/Views/Partials/grid/bootstrap3.cshtml deleted file mode 100644 index 8863788..0000000 --- a/src/TestSite.11/Views/Partials/grid/bootstrap3.cshtml +++ /dev/null @@ -1,112 +0,0 @@ -@using System.Web -@using Microsoft.AspNetCore.Html -@using Newtonsoft.Json.Linq -@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage - -@if (Model is JObject && Model?.sections is not null) -{ - var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1; - -
- @if (oneColumn) - { - foreach (var section in Model.sections) - { -
- @foreach (var row in section.rows) - { - renderRow(row, true); - } -
- } - } - else - { -
-
- @foreach (var sec in Model.sections) - { -
-
- @foreach (var row in sec.rows) - { - renderRow(row, false); - } -
-
- } -
-
- } -
-} - -@functions{ - - private async Task renderRow(dynamic row, bool singleColumn) - { -
- @if (singleColumn) { - @:
- } -
- @foreach (var area in row.areas) - { -
-
- @foreach (var control in area.controls) - { - if (control?.editor?.view != null) - { - @await Html.PartialAsync("grid/editors/base", (object)control) - } - } -
-
- } -
- @if (singleColumn) { - @:
- } -
- } - -} - -@functions{ - - public static HtmlString RenderElementAttributes(dynamic contentItem) - { - var attrs = new List(); - JObject cfg = contentItem.config; - - if (cfg != null) - { - foreach (JProperty property in cfg.Properties()) - { - var propertyValue = HttpUtility.HtmlAttributeEncode(property.Value.ToString()); - attrs.Add(property.Name + "=\"" + propertyValue + "\""); - } - } - - JObject style = contentItem.styles; - - if (style != null) - { - var cssVals = new List(); - foreach (JProperty property in style.Properties()) - { - var propertyValue = property.Value.ToString(); - if (string.IsNullOrWhiteSpace(propertyValue) == false) - { - cssVals.Add(property.Name + ":" + propertyValue + ";"); - } - } - - if (cssVals.Any()) - attrs.Add("style=\"" + HttpUtility.HtmlAttributeEncode(string.Join(" ", cssVals)) + "\""); - } - - return new HtmlString(string.Join(" ", attrs)); - } -} diff --git a/src/TestSite.11/Views/Partials/grid/editors/base.cshtml b/src/TestSite.11/Views/Partials/grid/editors/base.cshtml deleted file mode 100644 index e40543b..0000000 --- a/src/TestSite.11/Views/Partials/grid/editors/base.cshtml +++ /dev/null @@ -1,27 +0,0 @@ -@model dynamic - -@try -{ - string editor = EditorView(Model); - @await Html.PartialAsync(editor, Model as object) -} -catch (Exception ex) -{ - 
@ex.ToString()
-} - -@functions{ - - public static string EditorView(dynamic contentItem) - { - string view = contentItem.editor.render != null ? contentItem.editor.render.ToString() : contentItem.editor.view.ToString(); - view = view.Replace(".html", ".cshtml"); - - if (!view.Contains("/")) - { - view = "grid/editors/" + view; - } - - return view; - } -} diff --git a/src/TestSite.11/Views/Partials/grid/editors/embed.cshtml b/src/TestSite.11/Views/Partials/grid/editors/embed.cshtml deleted file mode 100644 index 74c8fe2..0000000 --- a/src/TestSite.11/Views/Partials/grid/editors/embed.cshtml +++ /dev/null @@ -1,11 +0,0 @@ -@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage - -@if (Model is not null) -{ - string embedValue = Convert.ToString(Model.value); - embedValue = embedValue.DetectIsJson() ? Model.value.preview : Model.value; - -
- @Html.Raw(embedValue) -
-} diff --git a/src/TestSite.11/Views/Partials/grid/editors/macro.cshtml b/src/TestSite.11/Views/Partials/grid/editors/macro.cshtml deleted file mode 100644 index a4450d1..0000000 --- a/src/TestSite.11/Views/Partials/grid/editors/macro.cshtml +++ /dev/null @@ -1,15 +0,0 @@ -@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage - -@if (Model?.value is not null) -{ - string macroAlias = Model.value.macroAlias.ToString(); - var parameters = new Dictionary(); - foreach (var mpd in Model.value.macroParamsDictionary) - { - parameters.Add(mpd.Name, mpd.Value); - } - - - @await Umbraco.RenderMacroAsync(macroAlias, parameters) - -} diff --git a/src/TestSite.11/Views/Partials/grid/editors/media.cshtml b/src/TestSite.11/Views/Partials/grid/editors/media.cshtml deleted file mode 100644 index bc3b111..0000000 --- a/src/TestSite.11/Views/Partials/grid/editors/media.cshtml +++ /dev/null @@ -1,64 +0,0 @@ -@model dynamic -@using Umbraco.Cms.Core.Media -@using Umbraco.Cms.Core.PropertyEditors.ValueConverters -@inject IImageUrlGenerator ImageUrlGenerator - -@if (Model?.value is not null) -{ - var url = Model.value.image; - - if (Model.editor.config != null && Model.editor.config.size != null) - { - if (Model.value.coordinates != null) - { - url = ImageCropperTemplateCoreExtensions.GetCropUrl( - (string)url, - ImageUrlGenerator, - width: (int)Model.editor.config.size.width, - height: (int)Model.editor.config.size.height, - cropAlias: "default", - cropDataSet: new ImageCropperValue - { - Crops = new[] - { - new ImageCropperValue.ImageCropperCrop - { - Alias = "default", - Coordinates = new ImageCropperValue.ImageCropperCropCoordinates - { - X1 = (decimal)Model.value.coordinates.x1, - Y1 = (decimal)Model.value.coordinates.y1, - X2 = (decimal)Model.value.coordinates.x2, - Y2 = (decimal)Model.value.coordinates.y2 - } - } - } - }); - } - else - { - url = ImageCropperTemplateCoreExtensions.GetCropUrl( - (string)url, - ImageUrlGenerator, - width: (int)Model.editor.config.size.width, - height: (int)Model.editor.config.size.height, - cropDataSet: new ImageCropperValue - { - FocalPoint = new ImageCropperValue.ImageCropperFocalPoint - { - Top = Model.value.focalPoint == null ? 0.5m : Model.value.focalPoint.top, - Left = Model.value.focalPoint == null ? 0.5m : Model.value.focalPoint.left - } - }); - } - } - - var altText = Model.value.altText ?? Model.value.caption ?? string.Empty; - - @altText - - if (Model.value.caption != null) - { -

@Model.value.caption

- } -} diff --git a/src/TestSite.11/Views/Partials/grid/editors/rte.cshtml b/src/TestSite.11/Views/Partials/grid/editors/rte.cshtml deleted file mode 100644 index 9445666..0000000 --- a/src/TestSite.11/Views/Partials/grid/editors/rte.cshtml +++ /dev/null @@ -1,13 +0,0 @@ -@using Umbraco.Cms.Core.Templates -@model dynamic -@inject HtmlLocalLinkParser HtmlLocalLinkParser; -@inject HtmlUrlParser HtmlUrlParser; -@inject HtmlImageSourceParser HtmlImageSourceParser; - -@{ - var value = HtmlLocalLinkParser.EnsureInternalLinks(Model?.value.ToString()); - value = HtmlUrlParser.EnsureUrls(value); - value = HtmlImageSourceParser.EnsureImageSources(value); -} - -@Html.Raw(value) diff --git a/src/TestSite.11/Views/Partials/grid/editors/textstring.cshtml b/src/TestSite.11/Views/Partials/grid/editors/textstring.cshtml deleted file mode 100644 index e6b9352..0000000 --- a/src/TestSite.11/Views/Partials/grid/editors/textstring.cshtml +++ /dev/null @@ -1,22 +0,0 @@ -@model dynamic - -@if (Model?.editor.config.markup is not null) -{ - string markup = Model.editor.config.markup.ToString(); - markup = markup.Replace("#value#", Html.ReplaceLineBreaks((string)Model.value.ToString()).ToString()); - - if (Model.editor.config.style != null) - { - markup = markup.Replace("#style#", Model.editor.config.style.ToString()); - } - - - @Html.Raw(markup) - -} -else -{ - -
@Model?.value
- -} diff --git a/src/TestSite.11/Views/_ViewImports.cshtml b/src/TestSite.11/Views/_ViewImports.cshtml deleted file mode 100644 index 097d0db..0000000 --- a/src/TestSite.11/Views/_ViewImports.cshtml +++ /dev/null @@ -1,9 +0,0 @@ -@using Umbraco.Extensions -@using TestSite.Eleven -@using Umbraco.Cms.Web.Common.PublishedModels -@using Umbraco.Cms.Web.Common.Views -@using Umbraco.Cms.Core.Models.PublishedContent -@using Microsoft.AspNetCore.Html -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers -@addTagHelper *, Smidge -@inject Smidge.SmidgeHelper SmidgeHelper diff --git a/src/TestSite.11/appsettings.Development.json b/src/TestSite.11/appsettings.Development.json deleted file mode 100644 index b33453b..0000000 --- a/src/TestSite.11/appsettings.Development.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "$schema": "appsettings-schema.json", - "Serilog": { - "MinimumLevel": { - "Default": "Information" - }, - "WriteTo": [ - { - "Name": "Async", - "Args": { - "configure": [ - { - "Name": "Console" - } - ] - } - } - ] - }, - "ConnectionStrings": { - "umbracoDbDSN": "Data Source=|DataDirectory|/Umbraco.sqlite.db;Cache=Shared;Foreign Keys=True;Pooling=True", - "umbracoDbDSN_ProviderName": "Microsoft.Data.Sqlite" - }, - "Umbraco": { - "CMS": { - "Unattended": { - "InstallUnattended": true, - "UnattendedUserName": "Administrator", - "UnattendedUserEmail": "admin@example.com", - "UnattendedUserPassword": "1234567890" - }, - "Content": { - "MacroErrors": "Throw" - }, - "Hosting": { - "Debug": true - }, - "RuntimeMinification": { - "UseInMemoryCache": true, - "CacheBuster": "Timestamp" - } - } - } -} diff --git a/src/TestSite.11/appsettings.json b/src/TestSite.11/appsettings.json deleted file mode 100644 index 78953b0..0000000 --- a/src/TestSite.11/appsettings.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "$schema": "appsettings-schema.json", - "Serilog": { - "MinimumLevel": { - "Default": "Information", - "Override": { - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information", - "System": "Warning" - } - } - }, - "Umbraco": { - "CMS": { - "Global": { - "SanitizeTinyMce": true - }, - "Content": { - "AllowEditInvariantFromNonDefault": true, - "ContentVersionCleanupPolicy": { - "EnableCleanup": true - } - } - } - } -} diff --git a/src/TestSite.11/wwwroot/favicon.ico b/src/TestSite.11/wwwroot/favicon.ico deleted file mode 100644 index c0749ddf7f1b68606b0672aa8d709779d6b0817a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15406 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 diff --git a/src/jcdcdev.Umbraco.Core.sln b/src/jcdcdev.Umbraco.Core.sln index 359ee19..4295c92 100644 --- a/src/jcdcdev.Umbraco.Core.sln +++ b/src/jcdcdev.Umbraco.Core.sln @@ -27,10 +27,6 @@ Global {989D710F-EC50-4EFF-AE9D-26A68694FDB5}.Debug|Any CPU.Build.0 = Debug|Any CPU {989D710F-EC50-4EFF-AE9D-26A68694FDB5}.Release|Any CPU.ActiveCfg = Release|Any CPU {989D710F-EC50-4EFF-AE9D-26A68694FDB5}.Release|Any CPU.Build.0 = Release|Any CPU - {F08FE559-22F7-4EA3-A389-8892F4E94D97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F08FE559-22F7-4EA3-A389-8892F4E94D97}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F08FE559-22F7-4EA3-A389-8892F4E94D97}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F08FE559-22F7-4EA3-A389-8892F4E94D97}.Release|Any CPU.Build.0 = Release|Any CPU {843A2979-DB5B-4824-B730-29F8CD6F1243}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {843A2979-DB5B-4824-B730-29F8CD6F1243}.Debug|Any CPU.Build.0 = Debug|Any CPU {843A2979-DB5B-4824-B730-29F8CD6F1243}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -51,12 +47,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Github", "Github", "{5830A8 ProjectSection(SolutionItems) = preProject ..\.github\workflows\release.yml = ..\.github\workflows\release.yml ..\.github\workflows\build.yml = ..\.github\workflows\build.yml - ..\.github\workflows\generate-icon.yml = ..\.github\workflows\generate-icon.yml ..\.github\dependabot.yml = ..\.github\dependabot.yml EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestSite.11", "TestSite.11\TestSite.11.csproj", "{F08FE559-22F7-4EA3-A389-8892F4E94D97}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestSite.12", "TestSite.12\TestSite.12.csproj", "{843A2979-DB5B-4824-B730-29F8CD6F1243}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestSite.13", "TestSite.13\TestSite.13.csproj", "{6852CB9E-0766-4852-ADBB-C5855591EEDE}" From 658fc249630b6c800e6e8f71312ac11ba813fb2e Mon Sep 17 00:00:00 2001 From: jcdcdev Date: Sun, 7 Apr 2024 22:57:19 +0100 Subject: [PATCH 8/9] chore: editor config --- src/.editorconfig | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/.editorconfig b/src/.editorconfig index 8e325af..ebed0b1 100644 --- a/src/.editorconfig +++ b/src/.editorconfig @@ -1,8 +1,12 @@ [*] max_line_length = 200 -indent_style = tab +indent_style = space indent_size = 4 tab_width = 4 +insert_final_newline = true +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true # ReSharper properties resharper_braces_redundant = false From 58dae2a4e9afe12ef2f8ad6f7b05fdb03a7fc0e8 Mon Sep 17 00:00:00 2001 From: jcdcdev Date: Sun, 7 Apr 2024 22:58:19 +0100 Subject: [PATCH 9/9] +changelog-ignore: actions --- .github/dependabot.yml | 22 ++++++++++++++++------ .github/workflows/build.yml | 10 +++++++--- .github/workflows/generate-icon.yml | 10 ---------- .github/workflows/release.yml | 15 ++++++++------- .github/workflows/update-releases.yml | 18 ++++++++++++++++++ 5 files changed, 49 insertions(+), 26 deletions(-) delete mode 100644 .github/workflows/generate-icon.yml create mode 100644 .github/workflows/update-releases.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 81964cf..fa0aac7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,11 +1,21 @@ version: 2 updates: - - package-ecosystem: "nuget" + - package-ecosystem: nuget directory: "/" schedule: interval: "daily" - time: "08:00" - ignore: - - dependency-name: "Umbraco.Cms.*" - - dependency-name: "Umbraco.Core.*" - target-branch: "dev" \ No newline at end of file + time: "04:00" + commit-message: + prefix: "chore" + include: "scope" + target-branch: "dev" + + - package-ecosystem: npm + directory: "/" + schedule: + interval: "daily" + time: "04:00" + commit-message: + prefix: "chore" + include: "scope" + target-branch: "dev" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c05e5e9..430265f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,11 +1,15 @@ -name: Build +name: 🏗️ Build on: pull_request: branches: "*" workflow_dispatch: jobs: + metadata: + uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/generate-project-metadata.yml@main build: uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/build-template.yml@main + needs: + - metadata with: - project-name: 'jcdcdev.Umbraco.Core' - project-path: './src/jcdcdev.Umbraco.Core/jcdcdev.Umbraco.Core.csproj' \ No newline at end of file + project-name: ${{ needs.metadata.outputs.project-name }} + project-path: ${{ needs.metadata.outputs.project-path }} \ No newline at end of file diff --git a/.github/workflows/generate-icon.yml b/.github/workflows/generate-icon.yml deleted file mode 100644 index 4752dde..0000000 --- a/.github/workflows/generate-icon.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: Build -on: - workflow_dispatch: -jobs: - build: - uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/generate-icon.yml@main - with: - color-primary: '#5d584d' - color-secondary: '#73573c' - color-tertiary: '#aba377' \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1fd79df..56ff520 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,15 +1,16 @@ -name: Release +name: 🚀 Release on: - pull_request: - branches: [ "main" ] - types: [ closed ] workflow_dispatch: jobs: + metadata: + uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/generate-project-metadata.yml@main build: - uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/build-template.yml@main + uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/build-template.yml@main + needs: + - metadata with: - project-name: 'jcdcdev.Umbraco.Core' - project-path: './src/jcdcdev.Umbraco.Core/jcdcdev.Umbraco.Core.csproj' + project-name: ${{ needs.metadata.outputs.project-name}} + project-path: ${{ needs.metadata.outputs.project-path }} release: needs: - build diff --git a/.github/workflows/update-releases.yml b/.github/workflows/update-releases.yml new file mode 100644 index 0000000..c3d07e5 --- /dev/null +++ b/.github/workflows/update-releases.yml @@ -0,0 +1,18 @@ +name: 📄 Update Releases +on: + workflow_dispatch: + inputs: + start-version: + required: true + default: '0.1.0' + end-version: + required: true + default: '999.999.999' +jobs: + update-releases: + uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/update-all-releases.yml@main + permissions: + contents: write + with: + start-version: ${{ inputs.start-version}} + end-version: ${{ inputs.end-version}} \ No newline at end of file