-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Umbraco 10 version * Revert some site csproj changes * Fix some warnings * Fix for language files not being loaded * Setup new version numbers * Set version to Umbraco 10 * Set version to 2.0.0
- Loading branch information
1 parent
7801df9
commit 5a5c61b
Showing
42 changed files
with
3,972 additions
and
113 deletions.
There are no files selected for viewing
53 changes: 53 additions & 0 deletions
53
src/SeoToolkit.Umbraco.Common.Core/Composers/SeoToolkitComposer.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
using System.Collections.Generic; | ||
using System.IO; | ||
using System.Linq; | ||
using Microsoft.AspNetCore.Hosting; | ||
using Microsoft.Extensions.DependencyInjection; | ||
using Umbraco.Cms.Core.Composing; | ||
using Umbraco.Cms.Core.DependencyInjection; | ||
using Umbraco.Extensions; | ||
using SeoToolkit.Umbraco.Common.Core.Collections; | ||
using SeoToolkit.Umbraco.Common.Core.ContentApps; | ||
using SeoToolkit.Umbraco.Common.Core.Dashboards; | ||
using SeoToolkit.Umbraco.Common.Core.Repositories.SeoSettingsRepository; | ||
using SeoToolkit.Umbraco.Common.Core.Sections; | ||
using SeoToolkit.Umbraco.Common.Core.Services.SeoSettingsService; | ||
using Umbraco.Cms.Core.Services; | ||
|
||
namespace SeoToolkit.Umbraco.Common.Core.Composers | ||
{ | ||
public class SeoToolkitComposer : IComposer | ||
{ | ||
public void Compose(IUmbracoBuilder builder) | ||
{ | ||
builder.Sections().Append<SeoToolkitSection>(); | ||
|
||
builder.Dashboards().Add<WelcomeDashboard>(); | ||
|
||
builder.ContentApps().Append<SeoSettingsContentAppFactory>(); | ||
builder.ContentApps().Append<SeoContentAppFactory>(); | ||
|
||
builder.Services.AddSingleton<ModuleCollection>(); | ||
|
||
builder.Services.AddUnique<ISeoSettingsRepository, SeoSettingsRepository>(); | ||
builder.Services.AddUnique<ISeoSettingsService, SeoSettingsService>(); | ||
|
||
/*builder.Services.AddTransient(sp => | ||
{ | ||
var languageFiles = new List<LocalizedTextServiceSupplementaryFileSource>(); | ||
var webhostEnvironment = sp.GetRequiredService<IWebHostEnvironment>(); | ||
var seoToolkitFolder = webhostEnvironment.ContentRootFileProvider.GetDirectoryContents("/App_Plugins/SeoToolkit/"); | ||
foreach (var dir in seoToolkitFolder.Where(it => it.IsDirectory)) | ||
{ | ||
foreach (var langDir in new DirectoryInfo(dir.PhysicalPath).EnumerateDirectories().Where(d => d.Exists && d.Name.InvariantEquals("lang"))) | ||
{ | ||
languageFiles.AddRange(langDir.EnumerateFiles("*.xml").Select(langFile => new LocalizedTextServiceSupplementaryFileSource(langFile, false))); | ||
} | ||
} | ||
languageFiles.Add(new LocalizedTextServiceSupplementaryFileSource(new FileInfo(webhostEnvironment.ContentRootFileProvider.GetFileInfo("/App_Plugins/SeoToolkit/lang/en-us.xml").PhysicalPath), false)); | ||
return (IEnumerable<LocalizedTextServiceSupplementaryFileSource>)languageFiles; | ||
});*/ | ||
} | ||
} | ||
} |
31 changes: 0 additions & 31 deletions
31
src/SeoToolkit.Umbraco.Common.Core/Composers/USeoToolkitComposer.cs
This file was deleted.
Oops, something went wrong.
4 changes: 2 additions & 2 deletions
4
...eoToolkit.Umbraco.Common.Core/Repositories/SeoSettingsRepository/SeoSettingsRepository.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 5 additions & 5 deletions
10
...ds.Core/Repositories/MetaFieldsSettingsRepository/MetaFieldsSettingsDatabaseRepository.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...t.Umbraco.MetaFields.Core/Repositories/SeoValueRepository/MetaFieldsDatabaseRepository.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/SeoToolkit.Umbraco.RobotsTxt.Core/Repositories/RobotsTxtRepository.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.