yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v9/dev' into v9/bugfix/fix_issues_when_changing_umbraco_path

Browse Source
This commit is contained in:
Bjarke Berg
2021-09-08 18:17:39 +02:00
parent 6c56c298d6 774a021ea5
commit 995595cce1
14 changed files with 72 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
build/templates/UmbracoPackage/.template.config/template.json
View File

@@ -30,13 +30,53 @@
},
"namespaceReplacer": {
"type": "generated",
"generator": "coalesce",
"generator": "regex",
"dataType": "string",
"replaces": "UmbracoPackage",
"parameters": {
"sourceVariableName": "name",
"defaultValue": "UmbracoPackage",
"fallbackVariableName": "name"
},
"replaces":"UmbracoPackage"
"source": "name",
"steps": [
{
"regex": "\\s",
"replacement": "_"
},
{
"regex": "-",
"replacement": "_"
},
{
"regex": "^[^a-zA-Z_]+",
"replacement": "_"
}
]
}
},
"msbuildReplacer": {
"type": "generated",
"generator": "regex",
"dataType": "string",
"replaces": "UmbracoPackageMsBuild",
"parameters": {
"source": "name",
"steps": [
{
"regex": "\\s",
"replacement": ""
},
{
"regex": "\\.",
"replacement": ""
},
{
"regex": "-",
"replacement": ""
},
{
"regex": "^[^a-zA-Z_]+",
"replacement": ""
}
]
}
},
"Framework": {
"type": "parameter",

1
build/templates/UmbracoPackage/UmbracoPackage.csproj
View File

@@ -8,6 +8,7 @@
<Description>...</Description>
<Product>...</Product>
<PackageTags>umbraco plugin package</PackageTags>
<RootNamespace>UmbracoPackage</RootNamespace>
</PropertyGroup>
<ItemGroup>

18
build/templates/UmbracoPackage/build/UmbracoPackage.targets
View File

@@ -1,27 +1,27 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<UmbracoPackageContentFilesPath>$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoPackage\**\*.*</UmbracoPackageContentFilesPath>
<UmbracoPackageMsBuildContentFilesPath>$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoPackage\**\*.*</UmbracoPackageMsBuildContentFilesPath>
</PropertyGroup>
<Target Name="CopyUmbracoPackageAssets" BeforeTargets="Build">
<Target Name="CopyUmbracoPackageMsBuildAssets" BeforeTargets="Build">
<ItemGroup>
<UmbracoPackageContentFiles Include="$(UmbracoPackageContentFilesPath)" />
<UmbracoPackageMsBuildContentFiles Include="$(UmbracoPackageMsBuildContentFilesPath)" />
</ItemGroup>
<Message Text="Copying UmbracoPackage files: $(UmbracoPackageContentFilesPath) - #@(UmbracoPackageContentFiles->Count()) files" Importance="high" />
<Message Text="Copying UmbracoPackage files: $(UmbracoPackageMsBuildContentFilesPath) - #@(UmbracoPackageMsBuildContentFiles->Count()) files" Importance="high" />
<Copy
SourceFiles="@(UmbracoPackageContentFiles)"
DestinationFiles="@(UmbracoPackageContentFiles->'$(MSBuildProjectDirectory)\App_Plugins\UmbracoPackage\%(RecursiveDir)%(Filename)%(Extension)')"
SourceFiles="@(UmbracoPackageMsBuildContentFiles)"
DestinationFiles="@(UmbracoPackageMsBuildContentFiles->'$(MSBuildProjectDirectory)\App_Plugins\UmbracoPackage\%(RecursiveDir)%(Filename)%(Extension)')"
SkipUnchangedFiles="true" />
</Target>
<Target Name="ClearUmbracoPackageAssets" BeforeTargets="Clean">
<Target Name="ClearUmbracoPackageMsBuildAssets" BeforeTargets="Clean">
<ItemGroup>
<UmbracoPackageDir Include="$(MSBuildProjectDirectory)\App_Plugins\UmbracoPackage\" />
<UmbracoPackageMsBuildDir Include="$(MSBuildProjectDirectory)\App_Plugins\UmbracoPackage\" />
</ItemGroup>
<Message Text="Clear old UmbracoPackage data" Importance="high" />
<RemoveDir Directories="@(UmbracoPackageDir)" />
<RemoveDir Directories="@(UmbracoPackageMsBuildDir)" />
</Target>
</Project>

4
src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs
View File

@@ -24,7 +24,7 @@ namespace Umbraco.Cms.Infrastructure.Examine
LuceneIndex index,
ILogger<LuceneIndexDiagnostics> logger,
IHostingEnvironment hostingEnvironment,
IOptionsSnapshot<LuceneDirectoryIndexOptions> indexOptions)
IOptionsMonitor<LuceneDirectoryIndexOptions> indexOptions)
{
_hostingEnvironment = hostingEnvironment;
_indexOptions = indexOptions.Get(index.Name);
@@ -63,7 +63,7 @@ namespace Umbraco.Cms.Infrastructure.Examine
{
var rootDir = _hostingEnvironment.ApplicationPhysicalPath;
d[nameof(UmbracoExamineIndex.LuceneIndexFolder)] = fsDir.Directory.ToString().ToLowerInvariant().TrimStart(rootDir.ToLowerInvariant()).Replace("\\", "/").EnsureStartsWith('/');
d["LuceneIndexFolder"] = fsDir.Directory.ToString().ToLowerInvariant().TrimStart(rootDir.ToLowerInvariant()).Replace("\\", " /").EnsureStartsWith('/');
}
if (_indexOptions != null)

2
src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
View File

@@ -21,7 +21,7 @@
<None Remove="obj\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Examine" Version="2.0.0-beta.154" />
<PackageReference Include="Examine" Version="2.0.0-beta.170" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

2
src/Umbraco.Examine.Lucene/UmbracoContentIndex.cs
View File

@@ -23,7 +23,7 @@ namespace Umbraco.Cms.Infrastructure.Examine
public UmbracoContentIndex(
ILoggerFactory loggerFactory,
string name,
IOptionsSnapshot<LuceneDirectoryIndexOptions> indexOptions,
IOptionsMonitor<LuceneDirectoryIndexOptions> indexOptions,
IHostingEnvironment hostingEnvironment,
IRuntimeState runtimeState,
ILocalizationService languageService = null)

2
src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs
View File

@@ -32,7 +32,7 @@ namespace Umbraco.Cms.Infrastructure.Examine
protected UmbracoExamineIndex(
ILoggerFactory loggerFactory,
string name,
IOptionsSnapshot<LuceneDirectoryIndexOptions> indexOptions,
IOptionsMonitor<LuceneDirectoryIndexOptions> indexOptions,
IHostingEnvironment hostingEnvironment,
IRuntimeState runtimeState)
: base(loggerFactory, name, indexOptions)

2
src/Umbraco.Examine.Lucene/UmbracoExamineIndexDiagnostics.cs
View File

@@ -18,7 +18,7 @@ namespace Umbraco.Cms.Infrastructure.Examine
UmbracoExamineIndex index,
ILogger<UmbracoExamineIndexDiagnostics> logger,
IHostingEnvironment hostingEnvironment,
IOptionsSnapshot<LuceneDirectoryIndexOptions> indexOptions)
IOptionsMonitor<LuceneDirectoryIndexOptions> indexOptions)
: base(index, logger, hostingEnvironment, indexOptions)
{
_index = index;

2
src/Umbraco.Examine.Lucene/UmbracoMemberIndex.cs
View File

@@ -17,7 +17,7 @@ namespace Umbraco.Cms.Infrastructure.Examine
public UmbracoMemberIndex(
ILoggerFactory loggerFactory,
string name,
IOptionsSnapshot<LuceneDirectoryIndexOptions> indexOptions,
IOptionsMonitor<LuceneDirectoryIndexOptions> indexOptions,
IHostingEnvironment hostingEnvironment,
IRuntimeState runtimeState)
: base(loggerFactory, name, indexOptions, hostingEnvironment, runtimeState)

2
src/Umbraco.Tests.Integration.SqlCe/Umbraco.Tests.Integration.SqlCe.csproj
View File

@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Examine.Lucene" Version="2.0.0-beta.154" />
<PackageReference Include="Examine.Lucene" Version="2.0.0-beta.170" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.9" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />

4
src/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs
View File

@@ -241,8 +241,8 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine
// return i;
//}
public static IOptionsSnapshot<LuceneDirectoryIndexOptions> GetOptions(string indexName, LuceneDirectoryIndexOptions options)
=> Mock.Of<IOptionsSnapshot<LuceneDirectoryIndexOptions>>(x => x.Get(indexName) == options);
public static IOptionsMonitor<LuceneDirectoryIndexOptions> GetOptions(string indexName, LuceneDirectoryIndexOptions options)
=> Mock.Of<IOptionsMonitor<LuceneDirectoryIndexOptions>>(x => x.Get(indexName) == options);
internal void IndexingError(object sender, IndexingErrorEventArgs e) => throw new ApplicationException(e.Message, e.Exception);

4
src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
View File

@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
@@ -74,7 +74,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Examine.Lucene" Version="2.0.0-beta.154" />
<PackageReference Include="Examine.Lucene" Version="2.0.0-beta.170" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.9" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />

3
src/Umbraco.Web.BackOffice/Security/BackOfficeAuthenticationBuilder.cs
View File

@@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Authentication;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Options;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Cms.Web.BackOffice.Security
@@ -22,7 +23,7 @@ namespace Umbraco.Cms.Web.BackOffice.Security
=> _loginProviderOptions = loginProviderOptions ?? (x => { });
public string SchemeForBackOffice(string scheme)
=> Constants.Security.BackOfficeExternalAuthenticationTypePrefix + scheme;
=> scheme?.EnsureStartsWith(Constants.Security.BackOfficeExternalAuthenticationTypePrefix);
/// <summary>
/// Overridden to track the final authenticationScheme being registered for the external login

4
src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
View File

@@ -35,8 +35,8 @@
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
<PackageReference Include="SixLabors.ImageSharp.Web" Version="1.0.3" />
<PackageReference Include="Smidge.Nuglify" Version="4.0.0-beta.352" />
<PackageReference Include="Smidge.InMemory" Version="4.0.0-beta.352" />
<PackageReference Include="Smidge.Nuglify" Version="4.0.0-beta.376" />
<PackageReference Include="Smidge.InMemory" Version="4.0.0-beta.376" />
<PackageReference Include="Dazinator.Extensions.FileProviders" Version="2.0.0" />
<PackageReference Include="Umbraco.Code" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>