Browse Source

Reverted to netstandard

pull/307/merge
Sebastian 8 years ago
parent
commit
fed592d39d
  1. 27
      src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleEventFormatter.cs
  2. 2
      src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj
  3. 2
      src/Squidex.Domain.Apps.Entities.MongoDb/Squidex.Domain.Apps.Entities.MongoDb.csproj
  4. 2
      src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj
  5. 2
      tools/Migrate_01/Migrate_01.csproj

27
src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleEventFormatter.cs

@ -22,9 +22,11 @@ namespace Squidex.Domain.Apps.Core.HandleRules
public class RuleEventFormatter public class RuleEventFormatter
{ {
private const string Undefined = "UNDEFINED"; private const string Undefined = "UNDEFINED";
private static readonly Regex ContentDataPlaceholder = new Regex(@"^CONTENT_DATA(\.([0-9A-Za-z\-_]*)){2,}", RegexOptions.Compiled); private static readonly char[] ContentPlaceholderStartOld = "CONTENT_DATA".ToCharArray();
private static readonly Regex ContentDataPlaceholder2 = new Regex(@"^\{CONTENT_DATA(\.([0-9A-Za-z\-_]*)){2,}\}", RegexOptions.Compiled); private static readonly char[] ContentPlaceholderStartNew = "{CONTENT_DATA".ToCharArray();
private readonly List<(string Pattern, Func<EnrichedEvent, string> Replacer)> patterns = new List<(string Pattern, Func<EnrichedEvent, string> Replacer)>(); private static readonly Regex ContentDataPlaceholderOld = new Regex(@"^CONTENT_DATA(\.([0-9A-Za-z\-_]*)){2,}", RegexOptions.Compiled);
private static readonly Regex ContentDataPlaceholderNew = new Regex(@"^\{CONTENT_DATA(\.([0-9A-Za-z\-_]*)){2,}\}", RegexOptions.Compiled);
private readonly List<(char[] Pattern, Func<EnrichedEvent, string> Replacer)> patterns = new List<(char[] Pattern, Func<EnrichedEvent, string> Replacer)>();
private readonly JsonSerializer serializer; private readonly JsonSerializer serializer;
private readonly IRuleUrlGenerator urlGenerator; private readonly IRuleUrlGenerator urlGenerator;
@ -50,7 +52,7 @@ namespace Squidex.Domain.Apps.Core.HandleRules
private void AddPattern(string placeholder, Func<EnrichedEvent, string> generator) private void AddPattern(string placeholder, Func<EnrichedEvent, string> generator)
{ {
patterns.Add((placeholder, generator)); patterns.Add((placeholder.ToCharArray(), generator));
} }
public virtual JObject ToPayload<T>(T @event) public virtual JObject ToPayload<T>(T @event)
@ -77,13 +79,16 @@ namespace Squidex.Domain.Apps.Core.HandleRules
var sb = new StringBuilder(); var sb = new StringBuilder();
var cp2 = new ReadOnlySpan<char>(ContentPlaceholderStartNew);
var cp1 = new ReadOnlySpan<char>(ContentPlaceholderStartOld);
for (var i = 0; i < current.Length; i++) for (var i = 0; i < current.Length; i++)
{ {
var c = current[i]; var c = current[i];
if (c == '$') if (c == '$')
{ {
sb.Append(current.Slice(0, i)); sb.Append(current.Slice(0, i).ToString());
current = current.Slice(i); current = current.Slice(i);
@ -106,17 +111,15 @@ namespace Squidex.Domain.Apps.Core.HandleRules
} }
} }
if (!tested && if (!tested && (test.StartsWith(cp1, StringComparison.OrdinalIgnoreCase) || test.StartsWith(cp2, StringComparison.OrdinalIgnoreCase)))
(test.StartsWith("CONTENT_DATA", StringComparison.OrdinalIgnoreCase) ||
test.StartsWith("{CONTENT_DATA", StringComparison.OrdinalIgnoreCase)))
{ {
var currentString = new string(test); var currentString = test.ToString();
var match = ContentDataPlaceholder.Match(currentString); var match = ContentDataPlaceholderOld.Match(currentString);
if (!match.Success) if (!match.Success)
{ {
match = ContentDataPlaceholder2.Match(currentString); match = ContentDataPlaceholderNew.Match(currentString);
} }
if (match.Success) if (match.Success)
@ -137,7 +140,7 @@ namespace Squidex.Domain.Apps.Core.HandleRules
} }
} }
sb.Append(current); sb.Append(current.ToString());
return sb.ToString(); return sb.ToString();
} }

2
src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>Squidex.Domain.Apps.Core</RootNamespace> <RootNamespace>Squidex.Domain.Apps.Core</RootNamespace>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

2
src/Squidex.Domain.Apps.Entities.MongoDb/Squidex.Domain.Apps.Entities.MongoDb.csproj

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebugType>full</DebugType> <DebugType>full</DebugType>

2
src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebugType>full</DebugType> <DebugType>full</DebugType>

2
tools/Migrate_01/Migrate_01.csproj

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\src\Squidex.Domain.Apps.Core.Model\Squidex.Domain.Apps.Core.Model.csproj" /> <ProjectReference Include="..\..\src\Squidex.Domain.Apps.Core.Model\Squidex.Domain.Apps.Core.Model.csproj" />

Loading…
Cancel
Save