Merge remote-tracking branch 'origin/master'

# Conflicts: # EvitaDB.Client/Converters/Models/Schema/EntitySchemaConverter.cs
FgForrest · Dec 7, 2023 · 8bf9f3d · 8bf9f3d
2 parents 5539e08 + 504814d
commit 8bf9f3d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/EvitaDB.Client/DataTypes/Data/NonSerializableDataAttribute.cs b/EvitaDB.Client/DataTypes/Data/NonSerializableDataAttribute.cs
@@ -0,0 +1,6 @@
+namespace EvitaDB.Client.DataTypes.Data;
+
+[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
+public class NonSerializableDataAttribute : Attribute
+{
+}
diff --git a/EvitaDB.Client/EvitaClient.cs b/EvitaDB.Client/EvitaClient.cs
@@ -583,6 +583,6 @@ private void AssertActive()
         }
     }
 
-    [GeneratedRegex("(\\w+:\\w+:\\w+): (.*)", RegexOptions.IgnoreCase | RegexOptions.Compiled, "en-US")]
+    [GeneratedRegex(@"(\w+:\w+:\w+): (.*)", RegexOptions.IgnoreCase | RegexOptions.Compiled, "en-US")]
     private static partial Regex MyRegex();
 }