Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for app_plugin files not being included for MetaFields and Sitemap #75

Merged
merged 4 commits into from
May 2, 2022
Merged

Fix for app_plugin files not being included for MetaFields and Sitemap #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
084ec5b
Possible fix for views not being copied
patrickdemooij9 May 2, 2022
8636f8c
Change build to move all SeoToolkit files
patrickdemooij9 May 2, 2022
70032dc
More build fixes
patrickdemooij9 May 2, 2022
636e857
Revert packages for the site
patrickdemooij9 May 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/SeoToolkit.Umbraco.MetaFields.Core/SeoToolkit.Umbraco.MetaFields.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageProjectUrl>https://github.com/patrickdemooij9/SeoToolkit.Umbraco</PackageProjectUrl>
<RepositoryUrl>https://github.com/patrickdemooij9/SeoToolkit.Umbraco</RepositoryUrl>
<PackageIconUrl>https://raw.githubusercontent.com/patrickdemooij9/SeoToolkit.Umbraco/main/package/SeoToolkitIcon.png</PackageIconUrl>
<Version>1.0.1</Version>
<Version>1.0.2</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
34 changes: 18 additions & 16 deletions src/SeoToolkit.Umbraco.MetaFields/SeoToolkit.Umbraco.MetaFields.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<ContentTargetFolders>.</ContentTargetFolders>
<Product>SeoToolkit MetaFields</Product>
<PackageId>SeoToolkit.Umbraco.MetaFields</PackageId>
<Title>SeoToolkit MetaFields</Title>
<Description>An Umbraco plugin to help you with your SEO meta fields.</Description>
<Product>SeoToolkit MetaFields</Product>
<PackageId>SeoToolkit.Umbraco.MetaFields</PackageId>
<Title>SeoToolkit MetaFields</Title>
<Description>An Umbraco plugin to help you with your SEO meta fields.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageTags>umbraco plugin package</PackageTags>
<RootNamespace>SeoToolkit.Umbraco.MetaFields</RootNamespace>
<PackageTags>umbraco plugin package</PackageTags>
<RootNamespace>SeoToolkit.Umbraco.MetaFields</RootNamespace>
<PackageProjectUrl>https://github.com/patrickdemooij9/SeoToolkit.Umbraco</PackageProjectUrl>
<RepositoryUrl>https://github.com/patrickdemooij9/SeoToolkit.Umbraco</RepositoryUrl>
<RepositoryUrl>https://github.com/patrickdemooij9/SeoToolkit.Umbraco</RepositoryUrl>
<PackageIconUrl>https://raw.githubusercontent.com/patrickdemooij9/SeoToolkit.Umbraco/main/package/SeoToolkitIcon.png</PackageIconUrl>
<Version>1.0.1</Version>
</PropertyGroup>
<Version>1.0.2</Version>
</PropertyGroup>

<ItemGroup>
<ItemGroup>
<Content Include="App_Plugins\SeoToolkit\MetaFields\**\*.*">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
Expand All @@ -25,11 +25,13 @@
<Pack>True</Pack>
<PackagePath>build</PackagePath>
</None>
</ItemGroup>
</ItemGroup>

<Import Project="..\SeoToolkit.Umbraco.Common\build\SeoToolkit.Umbraco.Common.targets" Condition="'$(Configuration)'=='Release'" />

<ItemGroup>
<ProjectReference Include="..\SeoToolkit.Umbraco.MetaFields.Core\SeoToolkit.Umbraco.MetaFields.Core.csproj" />
<ProjectReference Include="..\SeoToolkit.Umbraco.Common\SeoToolkit.Umbraco.Common.csproj" />
</ItemGroup>
<ProjectReference Include="..\SeoToolkit.Umbraco.MetaFields.Core\SeoToolkit.Umbraco.MetaFields.Core.csproj" />
<ProjectReference Include="..\SeoToolkit.Umbraco.Common\SeoToolkit.Umbraco.Common.csproj" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions src/SeoToolkit.Umbraco.MetaFields/build/SeoToolkit.Umbraco.MetaFields.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<SeoToolkitUmbracoMetaFieldsContentFilesPath>$(MSBuildThisFileDirectory)..\App_Plugins\SeoToolkit\MetaFields\**\*.*</SeoToolkitUmbracoMetaFieldsContentFilesPath>
<SeoToolkitUmbracoMetaFieldsContentFilesPath>$(MSBuildThisFileDirectory)..\App_Plugins\SeoToolkit\**\*.*</SeoToolkitUmbracoMetaFieldsContentFilesPath>
</PropertyGroup>

<Target Name="CopySeoToolkitUmbracoMetaFieldsAssets" BeforeTargets="Build">
Expand All @@ -11,14 +11,14 @@
<Message Text="Copying SeoToolkit files: $(SeoToolkitUmbracoMetaFieldsContentFilesPath) - #@(SeoToolkitUmbracoMetaFieldsContentFiles->Count()) files" Importance="high" />
<Copy
SourceFiles="@(SeoToolkitUmbracoMetaFieldsContentFiles)"
DestinationFiles="@(SeoToolkitUmbracoMetaFieldsContentFiles->'$(MSBuildProjectDirectory)\App_Plugins\SeoToolkit\MetaFields\%(RecursiveDir)%(Filename)%(Extension)')"
DestinationFiles="@(SeoToolkitUmbracoMetaFieldsContentFiles->'$(MSBuildProjectDirectory)\App_Plugins\SeoToolkit\%(RecursiveDir)%(Filename)%(Extension)')"
SkipUnchangedFiles="true" />

</Target>

<Target Name="ClearSeoToolkitUmbracoMetaFieldsAssets" BeforeTargets="Clean">
<ItemGroup>
<SeoToolkitUmbracoMetaFieldsDir Include="$(MSBuildProjectDirectory)\App_Plugins\SeoToolkit\MetaFields\" />
<SeoToolkitUmbracoMetaFieldsDir Include="$(MSBuildProjectDirectory)\App_Plugins\SeoToolkit\" />
</ItemGroup>
<Message Text="Clear old SeoToolkit MetaFields data" Importance="high" />
<RemoveDir Directories="@(SeoToolkitUmbracoMetaFieldsDir)" />
Expand Down
2 changes: 1 addition & 1 deletion src/SeoToolkit.Umbraco.Redirects.Core/SeoToolkit.Umbraco.Redirects.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageProjectUrl>https://github.com/patrickdemooij9/SeoToolkit.Umbraco</PackageProjectUrl>
<RepositoryUrl>https://github.com/patrickdemooij9/SeoToolkit.Umbraco</RepositoryUrl>
<PackageIconUrl>https://raw.githubusercontent.com/patrickdemooij9/SeoToolkit.Umbraco/main/package/SeoToolkitIcon.png</PackageIconUrl>
<Version>1.0.1</Version>
<Version>1.0.2</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 3 additions & 1 deletion src/SeoToolkit.Umbraco.Redirects/SeoToolkit.Umbraco.Redirects.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageProjectUrl>https://github.com/patrickdemooij9/SeoToolkit.Umbraco</PackageProjectUrl>
<RepositoryUrl>https://github.com/patrickdemooij9/SeoToolkit.Umbraco</RepositoryUrl>
<PackageIconUrl>https://raw.githubusercontent.com/patrickdemooij9/SeoToolkit.Umbraco/main/package/SeoToolkitIcon.png</PackageIconUrl>
<Version>1.0.1</Version>
<Version>1.0.2</Version>
</PropertyGroup>

<ItemGroup>
Expand All @@ -27,6 +27,8 @@
</None>
</ItemGroup>

<Import Project="..\SeoToolkit.Umbraco.Common\build\SeoToolkit.Umbraco.Common.targets" Condition="'$(Configuration)'=='Release'" />

<ItemGroup>
<ProjectReference Include="..\SeoToolkit.Umbraco.Common\SeoToolkit.Umbraco.Common.csproj" />
<ProjectReference Include="..\SeoToolkit.Umbraco.Redirects.Core\SeoToolkit.Umbraco.Redirects.Core.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/SeoToolkit.Umbraco.RobotsTxt.Core/SeoToolkit.Umbraco.RobotsTxt.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageProjectUrl>https://github.com/patrickdemooij9/SeoToolkit.Umbraco</PackageProjectUrl>
<RepositoryUrl>https://github.com/patrickdemooij9/SeoToolkit.Umbraco</RepositoryUrl>
<PackageIconUrl>https://raw.githubusercontent.com/patrickdemooij9/SeoToolkit.Umbraco/main/package/SeoToolkitIcon.png</PackageIconUrl>
<Version>1.0.1</Version>
<Version>1.0.2</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 3 additions & 1 deletion src/SeoToolkit.Umbraco.RobotsTxt/SeoToolkit.Umbraco.RobotsTxt.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageProjectUrl>https://github.com/patrickdemooij9/SeoToolkit.Umbraco</PackageProjectUrl>
<RepositoryUrl>https://github.com/patrickdemooij9/SeoToolkit.Umbraco</RepositoryUrl>
<PackageIconUrl>https://raw.githubusercontent.com/patrickdemooij9/SeoToolkit.Umbraco/main/package/SeoToolkitIcon.png</PackageIconUrl>
<Version>1.0.1</Version>
<Version>1.0.2</Version>
</PropertyGroup>

<ItemGroup>
Expand All @@ -27,6 +27,8 @@
</None>
</ItemGroup>

<Import Project="..\SeoToolkit.Umbraco.Common\build\SeoToolkit.Umbraco.Common.targets" Condition="'$(Configuration)'=='Release'" />

<ItemGroup>
<ProjectReference Include="..\SeoToolkit.Umbraco.RobotsTxt.Core\SeoToolkit.Umbraco.RobotsTxt.Core.csproj" />
<ProjectReference Include="..\SeoToolkit.Umbraco.Common\SeoToolkit.Umbraco.Common.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/SeoToolkit.Umbraco.ScriptManager.Core/SeoToolkit.Umbraco.ScriptManager.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageProjectUrl>https://github.com/patrickdemooij9/SeoToolkit.Umbraco</PackageProjectUrl>
<RepositoryUrl>https://github.com/patrickdemooij9/SeoToolkit.Umbraco</RepositoryUrl>
<PackageIconUrl>https://raw.githubusercontent.com/patrickdemooij9/SeoToolkit.Umbraco/main/package/SeoToolkitIcon.png</PackageIconUrl>
<Version>1.0.1</Version>
<Version>1.0.2</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 3 additions & 1 deletion src/SeoToolkit.Umbraco.ScriptManager/SeoToolkit.Umbraco.ScriptManager.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageProjectUrl>https://github.com/patrickdemooij9/SeoToolkit.Umbraco</PackageProjectUrl>
<RepositoryUrl>https://github.com/patrickdemooij9/SeoToolkit.Umbraco</RepositoryUrl>
<PackageIconUrl>https://raw.githubusercontent.com/patrickdemooij9/SeoToolkit.Umbraco/main/package/SeoToolkitIcon.png</PackageIconUrl>
<Version>1.0.1</Version>
<Version>1.0.2</Version>
</PropertyGroup>

<ItemGroup>
Expand All @@ -35,4 +35,6 @@
<PackagePath>build</PackagePath>
</None>
</ItemGroup>

<Import Project="..\SeoToolkit.Umbraco.Common\build\SeoToolkit.Umbraco.Common.targets" Condition="'$(Configuration)'=='Release'" />
</Project>
18 changes: 8 additions & 10 deletions src/SeoToolkit.Umbraco.Site/SeoToolkit.Umbraco.Site.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,15 @@
<Content Remove="umbraco/models/**" />
<Compile Include="umbraco/models/**" Exclude="**/*.flag" />
</ItemGroup>
<ItemGroup>
<Folder Include="App_Plugins\" />
<Folder Include="umbraco\models\" />
</ItemGroup>


<ItemGroup>
<!-- extends watching group to include *.js files -->
<Watch Include="**\*.js" Exclude="node_modules\**\*;**\*.js.map;obj\**\*;bin\**\*" />
</ItemGroup>
<Import Project="..\SeoToolkit.Umbraco.ScriptManager\build\SeoToolkit.Umbraco.ScriptManager.targets" />
<Import Project="..\SeoToolkit.Umbraco.Common\build\SeoToolkit.Umbraco.Common.targets" />
<Import Project="..\SeoToolkit.Umbraco.MetaFields\build\SeoToolkit.Umbraco.MetaFields.targets" />
Expand All @@ -42,15 +49,6 @@
<ItemGroup>
<ProjectReference Include="..\SeoToolkit.Umbraco\SeoToolkit.Umbraco.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="App_Plugins\" />
<Folder Include="umbraco\models\" />
</ItemGroup>

<ItemGroup>
<!-- extends watching group to include *.js files -->
<Watch Include="**\*.js" Exclude="node_modules\**\*;**\*.js.map;obj\**\*;bin\**\*" />
</ItemGroup>

<PropertyGroup>
<CopyRazorGenerateFilesToPublishDirectory>true</CopyRazorGenerateFilesToPublishDirectory>
Expand Down
2 changes: 2 additions & 0 deletions src/SeoToolkit.Umbraco.SiteAudit/SeoToolkit.Umbraco.SiteAudit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
<PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="9.0.1" />
</ItemGroup>

<Import Project="..\SeoToolkit.Umbraco.Common\build\SeoToolkit.Umbraco.Common.targets" Condition="'$(Configuration)'=='Release'" />

<ItemGroup>
<ProjectReference Include="..\SeoToolkit.Umbraco.SiteAudit.Core\SeoToolkit.Umbraco.SiteAudit.Core.csproj" />
<ProjectReference Include="..\SeoToolkit.Umbraco.Common\SeoToolkit.Umbraco.Common.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/SeoToolkit.Umbraco.Sitemap.Core/SeoToolkit.Umbraco.Sitemap.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageProjectUrl>https://github.com/patrickdemooij9/SeoToolkit.Umbraco</PackageProjectUrl>
<RepositoryUrl>https://github.com/patrickdemooij9/SeoToolkit.Umbraco</RepositoryUrl>
<PackageIconUrl>https://raw.githubusercontent.com/patrickdemooij9/SeoToolkit.Umbraco/main/package/SeoToolkitIcon.png</PackageIconUrl>
<Version>1.0.1</Version>
<Version>1.0.2</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 3 additions & 1 deletion src/SeoToolkit.Umbraco.Sitemap/SeoToolkit.Umbraco.Sitemap.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageProjectUrl>https://github.com/patrickdemooij9/SeoToolkit.Umbraco</PackageProjectUrl>
<RepositoryUrl>https://github.com/patrickdemooij9/SeoToolkit.Umbraco</RepositoryUrl>
<PackageIconUrl>https://raw.githubusercontent.com/patrickdemooij9/SeoToolkit.Umbraco/main/package/SeoToolkitIcon.png</PackageIconUrl>
<Version>1.0.1</Version>
<Version>1.0.2</Version>
</PropertyGroup>

<ItemGroup>
Expand All @@ -27,6 +27,8 @@
</None>
</ItemGroup>

<Import Project="..\SeoToolkit.Umbraco.Common\build\SeoToolkit.Umbraco.Common.targets" Condition="'$(Configuration)'=='Release'" />

<ItemGroup>
<ProjectReference Include="..\SeoToolkit.Umbraco.Sitemap.Core\SeoToolkit.Umbraco.Sitemap.Core.csproj" />
<ProjectReference Include="..\SeoToolkit.Umbraco.Common\SeoToolkit.Umbraco.Common.csproj" />
Expand Down
6 changes: 3 additions & 3 deletions src/SeoToolkit.Umbraco.Sitemap/build/SeoToolkit.Umbraco.Sitemap.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<SeoToolkitUmbracoSitemapContentFilesPath>$(MSBuildThisFileDirectory)..\App_Plugins\SeoToolkit\Sitemap\**\*.*</SeoToolkitUmbracoSitemapContentFilesPath>
<SeoToolkitUmbracoSitemapContentFilesPath>$(MSBuildThisFileDirectory)..\App_Plugins\SeoToolkit\**\*.*</SeoToolkitUmbracoSitemapContentFilesPath>
</PropertyGroup>

<Target Name="CopySeoToolkitUmbracoSitemapAssets" BeforeTargets="Build">
Expand All @@ -11,14 +11,14 @@
<Message Text="Copying SeoToolkit files: $(SeoToolkitUmbracoSitemapContentFilesPath) - #@(SeoToolkitUmbracoSitemapContentFiles->Count()) files" Importance="high" />
<Copy
SourceFiles="@(SeoToolkitUmbracoSitemapContentFiles)"
DestinationFiles="@(SeoToolkitUmbracoSitemapContentFiles->'$(MSBuildProjectDirectory)\App_Plugins\SeoToolkit\Sitemap\%(RecursiveDir)%(Filename)%(Extension)')"
DestinationFiles="@(SeoToolkitUmbracoSitemapContentFiles->'$(MSBuildProjectDirectory)\App_Plugins\SeoToolkit\%(RecursiveDir)%(Filename)%(Extension)')"
SkipUnchangedFiles="true" />

</Target>

<Target Name="ClearSeoToolkitUmbracoSitemapAssets" BeforeTargets="Clean">
<ItemGroup>
<SeoToolkitUmbracoSitemapDir Include="$(MSBuildProjectDirectory)\App_Plugins\SeoToolkit\Sitemap\" />
<SeoToolkitUmbracoSitemapDir Include="$(MSBuildProjectDirectory)\App_Plugins\SeoToolkit\" />
</ItemGroup>
<Message Text="Clear old SeoToolkit Sitemap data" Importance="high" />
<RemoveDir Directories="@(SeoToolkitUmbracoSitemapDir)" />
Expand Down