diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f9e46bf4..b981fab6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,80 +69,21 @@ jobs: $ReleaseFolder = Get-Item $Env:RELEASE_FOLDER $WebProjFolder = Get-Item $Env:WEB_PROJ_FOLDER - $TempFolder = Join-Path -Path $ReleaseFolder -ChildPath "Temp"; + # Ensure umbPack is installed + $IsUmbPackInstalled = dotnet tool update -g Umbraco.Tools.Packages - # Set the version number in createdPackages.config - $CreatedPackagesConfig = Join-Path -Path $BuildFolder -ChildPath "createdPackages.config" - $CreatedPackagesConfigXML = [xml](Get-Content $CreatedPackagesConfig) - $CreatedPackagesConfigXML.packages.package.version = "$Env:GITVERSION_MAJORMINORPATCH" - $CreatedPackagesConfigXML.Save($CreatedPackagesConfig) - - #copy the orig manifest to temp location to be updated to be used for the package - $PackageManifest = Join-Path -Path $BuildFolder -ChildPath "packageManifest.xml" - New-Item -ItemType Directory -Path $TempFolder - Copy-Item $PackageManifest "$TempFolder\package.xml" - $PackageManifest = (Join-Path -Path $TempFolder -ChildPath "package.xml") - - # Set the data in packageManifest.config - $PackageManifestXML = [xml](Get-Content $PackageManifest) - $PackageManifestXML.umbPackage.info.package.version = "$Env:GITVERSION_MAJORMINORPATCH" - $PackageManifestXML.umbPackage.info.package.name = $CreatedPackagesConfigXML.packages.package.name - $PackageManifestXML.umbPackage.info.package.license.set_InnerXML($CreatedPackagesConfigXML.packages.package.license.get_InnerXML()) - $PackageManifestXML.umbPackage.info.package.license.url = $CreatedPackagesConfigXML.packages.package.license.url - $PackageManifestXML.umbPackage.info.package.url = $CreatedPackagesConfigXML.packages.package.url - $PackageManifestXML.umbPackage.info.author.name = $CreatedPackagesConfigXML.packages.package.author.get_InnerXML() - $PackageManifestXML.umbPackage.info.author.website = $CreatedPackagesConfigXML.packages.package.author.url - - #clear the files from the manifest - $NewFilesXML = $PackageManifestXML.CreateElement("files") - - #package the files ... This will lookup all files in the file system that need to be there and update - # the package manifest XML with the correct data along with copying these files to the temp folder - # so they can be zipped with the package - - Function WritePackageFile ($f) - { - Write-Host $f.FullName -foregroundcolor cyan - $NewFileXML = $PackageManifestXML.CreateElement("file") - $NewFileXML.set_InnerXML("") - $GuidName = ([guid]::NewGuid()).ToString() + "_" + $f.Name - $NewFileXML.guid = $GuidName - $NewFileXML.orgPath = ReverseMapPath $f - $NewFileXML.orgName = $f.Name - $NewFilesXML.AppendChild($NewFileXML) - Copy-Item $f.FullName "$TempFolder\$GuidName" + if(-not $IsUmbPackInstalled){ + dotnet tool install -g Umbraco.Tools.Packages } - Function ReverseMapPath ($f) - { - $resultPath = "~"+ $f.Directory.FullName.Replace($WebProjFolder, "").Replace("\","/") - Return $resultPath - } - Function MapPath ($f) - { - $resultPath = Join-Path -Path $WebProjFolder -ChildPath ($f.Replace("~", "").Replace("/", "\")) - Return $resultPath - } - foreach($FileXML in $CreatedPackagesConfigXML.packages.package.files.file) - { - $File = Get-Item (MapPath $FileXML) - if ($File -is [System.IO.DirectoryInfo]) - { - Get-ChildItem -path $File -Recurse ` - | Where-Object { $_ -isnot [System.IO.DirectoryInfo]} ` - | ForEach-Object { WritePackageFile($_) } ` - | Out-Null - } - else { - WritePackageFile($File)| Out-Null - } - } - $PackageManifestXML.umbPackage.ReplaceChild($NewFilesXML, $PackageManifestXML.SelectSingleNode("/umbPackage/files")) | Out-Null - $PackageManifestXML.Save($PackageManifest) - - #zip the package - $DestZIP = "$ReleaseFolder\Articulate_$Env:GITVERSION_SEMVER.zip" - Add-Type -assembly "system.io.compression.filesystem" - [io.compression.zipfile]::CreateFromDirectory($TempFolder, $DestZIP) + + # Set the version number in package.xml + $PackageConfig = Join-Path -Path $BuildFolder -ChildPath "package.xml" + $PackageConfigXML = [xml](Get-Content $PackageConfig) + $PackageConfigXML.umbPackage.info.package.version = "$Env:GITVERSION_MAJORMINORPATCH" + $PackageConfigXML.Save($PackageConfig) + + $DestinationPath = "$ReleaseFolder\Articulate_$Env:GITVERSION_SEMVER.zip" + umbpack pack $PackageConfig -o $ReleaseFolder -v $Env:GITVERSION_MAJORMINORPATCH -n "Articulate_${Env:GITVERSION_SEMVER}.zip" - uses: actions/upload-artifact@v2 with: diff --git a/build/build.ps1 b/build/build.ps1 index 45e6cdac..e1faed4d 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -12,156 +12,29 @@ param ( $PSScriptFilePath = Get-Item $MyInvocation.MyCommand.Path $RepoRoot = $PSScriptFilePath.Directory.Parent.FullName $BuildFolder = Join-Path -Path $RepoRoot -ChildPath "build"; -$WebProjFolder = Join-Path -Path $RepoRoot -ChildPath "src\Articulate.Web"; $ReleaseFolder = Join-Path -Path $BuildFolder -ChildPath "Release"; -$TempFolder = Join-Path -Path $ReleaseFolder -ChildPath "Temp"; +$PackageFilePath = Join-Path -Path $BuildFolder -ChildPath "package.xml" $SolutionRoot = Join-Path -Path $RepoRoot "src"; -# Go get nuget.exe if we don't hae it -$NuGet = "$BuildFolder\nuget.exe" -$FileExists = Test-Path $NuGet -If ($FileExists -eq $False) { - Write-Host "Retrieving nuget.exe..." - $SourceNugetExe = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" - Invoke-WebRequest $SourceNugetExe -OutFile $NuGet -} - -# ensure we have vswhere -New-Item "$BuildFolder\vswhere" -type directory -force -$vswhere = "$BuildFolder\vswhere.exe" -if (-not (test-path $vswhere)) -{ - Write-Host "Download VsWhere..." - $path = "$ToolsFolder\tmp" - &$nuget install vswhere -OutputDirectory $path - $dir = ls "$path\vswhere.*" | sort -property Name -descending | select -first 1 - $file = ls -path "$dir" -name vswhere.exe -recurse - mv "$dir\$file" $vswhere -} +# Ensure umbPack is installed +$IsUmbPackInstalled = dotnet tool update -g Umbraco.Tools.Packages -$MSBuild = &$vswhere -latest -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe | select-object -first 1 -if (-not (test-path $MSBuild)) { - throw "MSBuild not found!" +if(-not $IsUmbPackInstalled){ + dotnet tool install -g Umbraco.Tools.Packages } - if ((Get-Item $ReleaseFolder -ErrorAction SilentlyContinue) -ne $null) { Write-Warning "$ReleaseFolder already exists on your local machine. It will now be deleted." Remove-Item $ReleaseFolder -Recurse } -####### DO THE SLN BUILD PART ############# - -# Set the version number in SolutionInfo.cs -$SolutionInfoPath = Join-Path -Path $SolutionRoot -ChildPath "SolutionInfo.cs" -(gc -Path $SolutionInfoPath) ` - -replace "(?<=Version\(`")[.\d]*(?=`"\))", $ReleaseVersionNumber | - Set-Content -Path $SolutionInfoPath -Encoding UTF8 -(gc -Path $SolutionInfoPath) ` - -replace "(?<=AssemblyInformationalVersion\(`")[.\w-]*(?=`"\))", "$ReleaseVersionNumber$PreReleaseName" | - Set-Content -Path $SolutionInfoPath -Encoding UTF8 -# Set the copyright -$Copyright = "Copyright " + [char]0x00A9 + " Shannon Deminick " + (Get-Date).year -(gc -Path $SolutionInfoPath) ` - -replace "(?<=AssemblyCopyright\(`").*(?=`"\))", $Copyright | - Set-Content -Path $SolutionInfoPath -Encoding UTF8; - -# Build the solution in release mode -$SolutionPath = Join-Path -Path $SolutionRoot -ChildPath "Articulate.sln"; - -#restore nuget packages -Write-Host "Restoring nuget packages..." -& $NuGet restore $SolutionPath - -# clean sln for all deploys -& $MSBuild "$SolutionPath" /p:Configuration=Release /maxcpucount /t:Clean -if (-not $?) -{ - throw "The MSBuild process returned an error code." -} - -#build -& $MSBuild "$SolutionPath" /p:Configuration=Release /maxcpucount -if (-not $?) -{ - throw "The MSBuild process returned an error code." -} - ####### DO THE UMBRACO PACKAGE BUILD ############# -# Set the version number in createdPackages.config -$CreatedPackagesConfig = Join-Path -Path $BuildFolder -ChildPath "createdPackages.config" -$CreatedPackagesConfigXML = [xml](Get-Content $CreatedPackagesConfig) -$CreatedPackagesConfigXML.packages.package.version = "$ReleaseVersionNumber" -$CreatedPackagesConfigXML.Save($CreatedPackagesConfig) - -#copy the orig manifest to temp location to be updated to be used for the package -$PackageManifest = Join-Path -Path $BuildFolder -ChildPath "packageManifest.xml" -New-Item -ItemType Directory -Path $TempFolder -Copy-Item $PackageManifest "$TempFolder\package.xml" -$PackageManifest = (Join-Path -Path $TempFolder -ChildPath "package.xml") - -# Set the data in packageManifest.config -$PackageManifestXML = [xml](Get-Content $PackageManifest) -$PackageManifestXML.umbPackage.info.package.version = "$ReleaseVersionNumber" -$PackageManifestXML.umbPackage.info.package.name = $CreatedPackagesConfigXML.packages.package.name -$PackageManifestXML.umbPackage.info.package.license.set_InnerXML($CreatedPackagesConfigXML.packages.package.license.get_InnerXML()) -$PackageManifestXML.umbPackage.info.package.license.url = $CreatedPackagesConfigXML.packages.package.license.url -$PackageManifestXML.umbPackage.info.package.url = $CreatedPackagesConfigXML.packages.package.url -$PackageManifestXML.umbPackage.info.author.name = $CreatedPackagesConfigXML.packages.package.author.get_InnerXML() -$PackageManifestXML.umbPackage.info.author.website = $CreatedPackagesConfigXML.packages.package.author.url - -#clear the files from the manifest -$NewFilesXML = $PackageManifestXML.CreateElement("files") - -#package the files ... This will lookup all files in the file system that need to be there and update -# the package manifest XML with the correct data along with copying these files to the temp folder -# so they can be zipped with the package - -Function WritePackageFile ($f) -{ - Write-Host $f.FullName -foregroundcolor cyan - $NewFileXML = $PackageManifestXML.CreateElement("file") - $NewFileXML.set_InnerXML("") - $GuidName = ([guid]::NewGuid()).ToString() + "_" + $f.Name - $NewFileXML.guid = $GuidName - $NewFileXML.orgPath = ReverseMapPath $f - $NewFileXML.orgName = $f.Name - $NewFilesXML.AppendChild($NewFileXML) - Copy-Item $f.FullName "$TempFolder\$GuidName" -} -Function ReverseMapPath ($f) -{ - $resultPath = "~"+ $f.Directory.FullName.Replace($WebProjFolder, "").Replace("\","/") - Return $resultPath -} -Function MapPath ($f) -{ - $resultPath = Join-Path -Path $WebProjFolder -ChildPath ($f.Replace("~", "").Replace("/", "\")) - Return $resultPath -} -foreach($FileXML in $CreatedPackagesConfigXML.packages.package.files.file) -{ - $File = Get-Item (MapPath $FileXML) - if ($File -is [System.IO.DirectoryInfo]) - { - Get-ChildItem -path $File -Recurse ` - | Where-Object { $_ -isnot [System.IO.DirectoryInfo]} ` - | ForEach-Object { WritePackageFile($_) } ` - | Out-Null - } - else { - WritePackageFile($File)| Out-Null - } -} -$PackageManifestXML.umbPackage.ReplaceChild($NewFilesXML, $PackageManifestXML.SelectSingleNode("/umbPackage/files")) | Out-Null -$PackageManifestXML.Save($PackageManifest) - -#zip the package -$DestZIP = "$ReleaseFolder\Articulate_$ReleaseVersionNumber$PreReleaseName.zip" -Add-Type -assembly "system.io.compression.filesystem" -[io.compression.zipfile]::CreateFromDirectory($TempFolder, $DestZIP) +# Set the version number in package.xml +$PackageConfig = Join-Path -Path $BuildFolder -ChildPath "package.xml" +$PackageConfigXML = [xml](Get-Content $PackageConfig) +$PackageConfigXML.umbPackage.info.package.version = "$ReleaseVersionNumber" +$PackageConfigXML.Save($PackageConfig) -$nuSpec = Join-Path -Path $BuildFolder -ChildPath "Articulate.nuspec"; -& $NuGet pack $nuSpec -BasePath $WebProjFolder -OutputDirectory $ReleaseFolder -Version "$ReleaseVersionNumber$PreReleaseName" -Properties "copyright=$Copyright;buildFolder=$BuildFolder" +umbpack pack $PackageFilePath -o $ReleaseFolder -v ($ReleaseVersionNumber + $PreReleaseName) \ No newline at end of file diff --git a/build/createdPackages.config b/build/createdPackages.config deleted file mode 100644 index 8fc19646..00000000 --- a/build/createdPackages.config +++ /dev/null @@ -1,53 +0,0 @@ - - - - MIT License - Shannon Deminick - Blogging built on Umbraco - Supports all the features you'd want in a blogging platform:

-Categories & Tags
-Themes
-Multiple archives
-Live Writer support
-Markdown support
-Post from your mobile phone including photos direct from you camera
-Disqus or Facebook comment support (or build your own)
-Search
-Blogml import/export
-Customizable RSS feeds
-Customizable urls
-Author profiles]]> - - - - 1050,1051,1052,1053,1054,1055 - - - - - - - 1056,1057,1058,1059,1061,1060,1062 - - - - ~/App_Plugins/Articulate - ~/bin/Articulate.dll - ~/bin/Argotic.Common.dll - ~/bin/Argotic.Extensions.dll - ~/bin/Argotic.Core.dll - ~/bin/CookComputing.XmlRpcV2.dll - ~/bin/CookComputing.XmlRpcServerV2.dll - ~/bin/Articulate.pdb - ~/media/articulate/original/author.jpg - ~/media/articulate/original/logo.png - ~/media/articulate/original/banner.jpg - ~/media/articulate/original/post1.jpg - ~/media/articulate/original/post2.jpg - - - - - - ~/App_Plugins/Articulate/BackOffice/PackageOptions/package-options.html - - \ No newline at end of file diff --git a/build/package.xml b/build/package.xml new file mode 100644 index 00000000..79bf7b7a --- /dev/null +++ b/build/package.xml @@ -0,0 +1,620 @@ + + + + + + + + Articulate + 4.3.3 + MIT License + https://github.com/Shandem/Articulate/ + https://raw.githubusercontent.com/Shazwazza/Articulate/master/assets/Icon-transparent.png + + 8 + 0 + 0 + + + + Shannon Deminick + http://shazwazza.com + + Blogging built on Umbraco - Supports all the features you'd want in a blogging platform:

+Categories & Tags
+Themes
+Multiple archives
+Live Writer support
+Markdown support
+Post from your mobile phone including photos direct from you camera
+Disqus or Facebook comment support (or build your own)
+Search
+Blogml import/export
+Customizable RSS feeds
+Customizable urls
+Author profiles]]> + + + + + Articulate + Articulate + icon-voice color-blue + folder.png + + True + False + + + + + + ArticulateArchive + ArticulateAuthors + + + + Blog Description + blogDescription + Umbraco.TextboxMultiple + c6bac0dd-4ab9-45b1-8e30-e4b619ee5da3 + Blog + False + + + + + Custom RSS Feed Url + customRssFeedUrl + Umbraco.Textbox + 0cc0eba1-9960-42c9-bf9b-60e150b429ae + Blog + False + + + + + Blog Title + blogTitle + Umbraco.Textbox + 0cc0eba1-9960-42c9-bf9b-60e150b429ae + Blog + True + + + + + Disqus Shortname + disqusShortname + Umbraco.Textbox + 0cc0eba1-9960-42c9-bf9b-60e150b429ae + Blog + False + + + + + Google Analytics Id + googleAnalyticsId + Umbraco.Textbox + 0cc0eba1-9960-42c9-bf9b-60e150b429ae + Blog + False + + + + + Google Analytics Name + googleAnalyticsName + Umbraco.Textbox + 0cc0eba1-9960-42c9-bf9b-60e150b429ae + Blog + False + + + + + PageSize + pageSize + Umbraco.Integer + 2e6d3631-066e-44b8-aec4-96f09099b2b5 + Customize + True + + + + + Categories Page Name + categoriesPageName + Umbraco.Textbox + 0cc0eba1-9960-42c9-bf9b-60e150b429ae + Customize + False + + + + + Categories Url Name + categoriesUrlName + Umbraco.Textbox + 0cc0eba1-9960-42c9-bf9b-60e150b429ae + Customize + True + + + + + Tags Page Name + tagsPageName + Umbraco.Textbox + 0cc0eba1-9960-42c9-bf9b-60e150b429ae + Customize + False + + + + + Tags Url Name + tagsUrlName + Umbraco.Textbox + 0cc0eba1-9960-42c9-bf9b-60e150b429ae + Customize + True + + + + + Search Page Name + searchPageName + Umbraco.Textbox + 0cc0eba1-9960-42c9-bf9b-60e150b429ae + Customize + False + + + + + Search Url Name + searchUrlName + Umbraco.Textbox + 0cc0eba1-9960-42c9-bf9b-60e150b429ae + Customize + False + + + + + Redirect Archive + redirectArchive + Umbraco.TrueFalse + 92897bc6-a5f3-4ffe-ae27-f2e7e33dda49 + Customize + False + + + + + Use yyyy/mm/dd format for Url + useDateFormatForUrl + Umbraco.TrueFalse + 762ca848-ade4-4d74-964c-81a3b1980cff + Customize + False + + + + + Blog Banner + blogBanner + Umbraco.ImageCropper + c8f535ee-27b8-4d16-940d-d6c523851bb1 + Style + False + + + + + Blog Logo + blogLogo + Umbraco.ImageCropper + c8f535ee-27b8-4d16-940d-d6c523851bb1 + Style + False + + + + + Theme + theme + ArticulateThemePicker + 8b57d00e-5593-45d3-affe-24203b239bd3 + Style + False + + + + + Extract First Image to Property + extractFirstImage + Umbraco.TrueFalse + 92897bc6-a5f3-4ffe-ae27-f2e7e33dda49 + MetaWeblog options + False + + + + + + + 12 + Blog + 0 + + + 13 + Customize + 1 + + + 14 + Style + 2 + + + 21 + MetaWeblog options + 3 + + + + + + Articulate Archive + ArticulateArchive + icon-list color-blue + folder.png + + False + True + + + + + + ArticulateMarkdown + ArticulateRichText + + + + Umbraco Url Name + umbracoUrlName + Umbraco.Textbox + 0cc0eba1-9960-42c9-bf9b-60e150b429ae + + False + + + + + + + + + Articulate Author + ArticulateAuthor + .sprTreeFolder + folder.png + + False + False + + + + + + + + Author Image + authorImage + Umbraco.ImageCropper + c8f535ee-27b8-4d16-940d-d6c523851bb1 + Author info + False + + + + + Author Url + authorUrl + Umbraco.Textbox + 0cc0eba1-9960-42c9-bf9b-60e150b429ae + Author info + False + + + + + Author Bio + authorBio + Umbraco.TextboxMultiple + c6bac0dd-4ab9-45b1-8e30-e4b619ee5da3 + Author info + False + + + + + + + 15 + Author info + 0 + + + + + + Articulate Authors + ArticulateAuthors + icon-user-females-alt color-blue + folder.png + + False + True + + + + + + ArticulateAuthor + + + + + + + Articulate Post + ArticulatePost + .sprTreeFolder + folder.png + + False + False + + + + + + + + umbracoUrlAlias + umbracoUrlAlias + Umbraco.Textbox + 0cc0eba1-9960-42c9-bf9b-60e150b429ae + + False + + + + + Import Id + importId + Umbraco.NoEdit + f0bc4bfb-b499-40d6-ba86-058885a5178c + + False + + + + + Tags + tags + Umbraco.Tags + f8404fdc-7667-4184-95c3-125b1d81314d + Post Attributes + False + + + + + Slug + umbracoUrlName + Umbraco.Textbox + 0cc0eba1-9960-42c9-bf9b-60e150b429ae + Post Attributes + False + + + + + Categories + categories + Umbraco.Tags + a72aeb12-5b28-4a47-b99a-fde14d49c1ac + Post Attributes + False + + + + + Excerpt + excerpt + Umbraco.TextboxMultiple + c6bac0dd-4ab9-45b1-8e30-e4b619ee5da3 + Post Attributes + False + + + + + Author + author + Umbraco.Textbox + 0cc0eba1-9960-42c9-bf9b-60e150b429ae + Post Attributes + True + + + + + Published Date + publishedDate + Umbraco.DateTime + e4d66c0f-b935-4200-81f0-025f7256b89a + Post Attributes + False + + + + + Enable Comments + enableComments + Umbraco.TrueFalse + 92897bc6-a5f3-4ffe-ae27-f2e7e33dda49 + Post Attributes + False + + + + + Post Image + postImage + Umbraco.ImageCropper + c8f535ee-27b8-4d16-940d-d6c523851bb1 + Image + False + + + + + Social Description + socialDescription + Umbraco.TextboxMultiple + c6bac0dd-4ab9-45b1-8e30-e4b619ee5da3 + Meta Tags + 0 + False + + + + + + 16 + Post Attributes + 0 + + + 19 + Content + 1 + + + 20 + Image + 2 + + + + + + Articulate Markdown + ArticulateMarkdown + icon-post-it color-blue + folder.png + + False + False + ArticulatePost + + ArticulatePost + + + + + + + + Markdown + markdown + Articulate.MarkdownEditor + 31d931c7-ce89-40a1-934e-664be25a1e8c + Content + False + + + + + + + 17 + Content + 0 + + + + + + Articulate Rich Text + ArticulateRichText + icon-post-it color-blue + folder.png + + False + False + ArticulatePost + + ArticulatePost + + + + + + + + Rich Text + richText + Umbraco.TinyMCE + dbcb0707-021d-4cd4-ba8b-5cc891516c28 + Content + False + + + + + + + 18 + Content + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build/packageManifest.xml b/build/packageManifest.xml deleted file mode 100644 index c81efe62..00000000 --- a/build/packageManifest.xml +++ /dev/null @@ -1,617 +0,0 @@ - - - - - - - - Articulate - 4.3.0 - MIT License - https://github.com/Shandem/Articulate/ - https://raw.githubusercontent.com/Shazwazza/Articulate/master/assets/Icon-transparent.png - - 8 - 0 - 0 - - - - Shannon Deminick - http://shazwazza.com - - - Blogging built on Umbraco - Supports all the features you'd want in a blogging platform:

-Categories & Tags
-Themes
-Multiple archives
-Live Writer support
-Markdown support
-Post from your mobile phone including photos direct from you camera
-Disqus or Facebook comment support (or build your own)
-Search
-Blogml import/export
-Customizable RSS feeds
-Customizable urls
-Author profiles]]> - - - - - - Articulate - Articulate - icon-voice color-blue - folder.png - - True - False - - - - - - ArticulateArchive - ArticulateAuthors - - - - Blog Description - blogDescription - Umbraco.TextboxMultiple - c6bac0dd-4ab9-45b1-8e30-e4b619ee5da3 - Blog - False - - - - - Custom RSS Feed Url - customRssFeedUrl - Umbraco.Textbox - 0cc0eba1-9960-42c9-bf9b-60e150b429ae - Blog - False - - - - - Blog Title - blogTitle - Umbraco.Textbox - 0cc0eba1-9960-42c9-bf9b-60e150b429ae - Blog - True - - - - - Disqus Shortname - disqusShortname - Umbraco.Textbox - 0cc0eba1-9960-42c9-bf9b-60e150b429ae - Blog - False - - - - - Google Analytics Id - googleAnalyticsId - Umbraco.Textbox - 0cc0eba1-9960-42c9-bf9b-60e150b429ae - Blog - False - - - - - Google Analytics Name - googleAnalyticsName - Umbraco.Textbox - 0cc0eba1-9960-42c9-bf9b-60e150b429ae - Blog - False - - - - - - PageSize - pageSize - Umbraco.Integer - 2e6d3631-066e-44b8-aec4-96f09099b2b5 - Customize - True - - - - - - Categories Page Name - categoriesPageName - Umbraco.Textbox - 0cc0eba1-9960-42c9-bf9b-60e150b429ae - Customize - False - - - - - Categories Url Name - categoriesUrlName - Umbraco.Textbox - 0cc0eba1-9960-42c9-bf9b-60e150b429ae - Customize - True - - - - - Tags Page Name - tagsPageName - Umbraco.Textbox - 0cc0eba1-9960-42c9-bf9b-60e150b429ae - Customize - False - - - - - Tags Url Name - tagsUrlName - Umbraco.Textbox - 0cc0eba1-9960-42c9-bf9b-60e150b429ae - Customize - True - - - - - Search Page Name - searchPageName - Umbraco.Textbox - 0cc0eba1-9960-42c9-bf9b-60e150b429ae - Customize - False - - - - - Search Url Name - searchUrlName - Umbraco.Textbox - 0cc0eba1-9960-42c9-bf9b-60e150b429ae - Customize - False - - - - - Redirect Archive - redirectArchive - Umbraco.TrueFalse - 92897bc6-a5f3-4ffe-ae27-f2e7e33dda49 - Customize - False - - - - - Use yyyy/mm/dd format for Url - useDateFormatForUrl - Umbraco.TrueFalse - 762ca848-ade4-4d74-964c-81a3b1980cff - Customize - False - - - - - Blog Banner - blogBanner - Umbraco.ImageCropper - c8f535ee-27b8-4d16-940d-d6c523851bb1 - Style - False - - - - - Blog Logo - blogLogo - Umbraco.ImageCropper - c8f535ee-27b8-4d16-940d-d6c523851bb1 - Style - False - - - - - Theme - theme - ArticulateThemePicker - 8b57d00e-5593-45d3-affe-24203b239bd3 - Style - False - - - - - Extract First Image to Property - extractFirstImage - Umbraco.TrueFalse - 92897bc6-a5f3-4ffe-ae27-f2e7e33dda49 - MetaWeblog options - False - - - - - - - 12 - Blog - 0 - - - 13 - Customize - 1 - - - 14 - Style - 2 - - - 21 - MetaWeblog options - 3 - - - - - - Articulate Archive - ArticulateArchive - icon-list color-blue - folder.png - - False - True - - - - - - ArticulateMarkdown - ArticulateRichText - - - - Umbraco Url Name - umbracoUrlName - Umbraco.Textbox - 0cc0eba1-9960-42c9-bf9b-60e150b429ae - - False - - - - - - - - - Articulate Author - ArticulateAuthor - .sprTreeFolder - folder.png - - False - False - - - - - - - - Author Image - authorImage - Umbraco.ImageCropper - c8f535ee-27b8-4d16-940d-d6c523851bb1 - Author info - False - - - - - Author Url - authorUrl - Umbraco.Textbox - 0cc0eba1-9960-42c9-bf9b-60e150b429ae - Author info - False - - - - - Author Bio - authorBio - Umbraco.TextboxMultiple - c6bac0dd-4ab9-45b1-8e30-e4b619ee5da3 - Author info - False - - - - - - - 15 - Author info - 0 - - - - - - Articulate Authors - ArticulateAuthors - icon-user-females-alt color-blue - folder.png - - False - True - - - - - - ArticulateAuthor - - - - - - - Articulate Post - ArticulatePost - .sprTreeFolder - folder.png - - False - False - - - - - - - - umbracoUrlAlias - umbracoUrlAlias - Umbraco.Textbox - 0cc0eba1-9960-42c9-bf9b-60e150b429ae - - False - - - - - Import Id - importId - Umbraco.NoEdit - f0bc4bfb-b499-40d6-ba86-058885a5178c - - False - - - - - Tags - tags - Umbraco.Tags - f8404fdc-7667-4184-95c3-125b1d81314d - Post Attributes - False - - - - - Slug - umbracoUrlName - Umbraco.Textbox - 0cc0eba1-9960-42c9-bf9b-60e150b429ae - Post Attributes - False - - - - - Categories - categories - Umbraco.Tags - a72aeb12-5b28-4a47-b99a-fde14d49c1ac - Post Attributes - False - - - - - Excerpt - excerpt - Umbraco.TextboxMultiple - c6bac0dd-4ab9-45b1-8e30-e4b619ee5da3 - Post Attributes - False - - - - - Author - author - Umbraco.Textbox - 0cc0eba1-9960-42c9-bf9b-60e150b429ae - Post Attributes - True - - - - - Published Date - publishedDate - Umbraco.DateTime - e4d66c0f-b935-4200-81f0-025f7256b89a - Post Attributes - False - - - - - Enable Comments - enableComments - Umbraco.TrueFalse - 92897bc6-a5f3-4ffe-ae27-f2e7e33dda49 - Post Attributes - False - - - - - Post Image - postImage - Umbraco.ImageCropper - c8f535ee-27b8-4d16-940d-d6c523851bb1 - Image - False - - - - - Social Description - socialDescription - Umbraco.TextboxMultiple - c6bac0dd-4ab9-45b1-8e30-e4b619ee5da3 - Meta Tags - 0 - False - - - - - - 16 - Post Attributes - 0 - - - 19 - Content - 1 - - - 20 - Image - 2 - - - - - - Articulate Markdown - ArticulateMarkdown - icon-post-it color-blue - folder.png - - False - False - ArticulatePost - - ArticulatePost - - - - - - - - Markdown - markdown - Articulate.MarkdownEditor - 31d931c7-ce89-40a1-934e-664be25a1e8c - Content - False - - - - - - - 17 - Content - 0 - - - - - - Articulate Rich Text - ArticulateRichText - icon-post-it color-blue - folder.png - - False - False - ArticulatePost - - ArticulatePost - - - - - - - - Rich Text - richText - Umbraco.TinyMCE - dbcb0707-021d-4cd4-ba8b-5cc891516c28 - Content - False - - - - - - - 18 - Content - 0 - - - - - - - - - - - - - - - - - - ~/App_Plugins/Articulate/BackOffice/PackageOptions/package-options.html - - - - diff --git a/src/Articulate.sln b/src/Articulate.sln index baff26c1..8a2c8e5c 100644 --- a/src/Articulate.sln +++ b/src/Articulate.sln @@ -24,9 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{7396E5F1 AssemblyCopyright.tt = AssemblyCopyright.tt ..\build\build.ps1 = ..\build\build.ps1 ..\.github\workflows\build.yml = ..\.github\workflows\build.yml - ..\build\createdPackages.config = ..\build\createdPackages.config ..\GitVersion.yml = ..\GitVersion.yml - ..\build\packageManifest.xml = ..\build\packageManifest.xml SolutionInfo.cs = SolutionInfo.cs EndProjectSection EndProject diff --git a/src/Articulate/Articulate.csproj b/src/Articulate/Articulate.csproj index 1b7d1b65..b7bb1a22 100644 --- a/src/Articulate/Articulate.csproj +++ b/src/Articulate/Articulate.csproj @@ -169,8 +169,8 @@ - - Resources\packageManifest.xml + + Resources\package.xml Designer @@ -446,4 +446,4 @@ --> - \ No newline at end of file + diff --git a/src/Articulate/Resources/ArticulateResources.resx b/src/Articulate/Resources/ArticulateResources.resx index a4a3dc6c..661fbe4c 100644 --- a/src/Articulate/Resources/ArticulateResources.resx +++ b/src/Articulate/Resources/ArticulateResources.resx @@ -119,6 +119,6 @@ - ..\..\..\build\packagemanifest.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + ..\..\..\build\package.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 - \ No newline at end of file +