Merge branch '7.0' into 7.0-nodecollection-add-imp

# Conflicts:
#	Orm/Xtensive.Orm/Sql/Model/NodeCollection.cs

Author: alex-kulakov

ChangeLog/6.0.13_Z_Final.txt

@@ -0,0 +1,8 @@
+[main] Fixed certain cases of bad translation of casts via 'as' operator in LINQ queries
+[main] Addressed certain issues of translation connected with comparison with local entity instace within LINQ queries
+[main] Fixed rare issues of incorrect translation of filtered index expressions including conditional expressions
+[main] Join/LeftJoin is denied to have the same expression instance for both inner/outer selector
+[main] Addressed issue when wrong type of join was chosen when .First/FirstOrDefalult() method was used as subquery
+[main] Added dedicated exception when RenameFieldHint.TargetType exists in current model but absent in storage model
+[main] Xtensive.Sql.Model.NodeCollection<T>.Add() throws understandable exception in case of duplicate name of item
+[postgresql] Fixed issue of incorrect translation of contitional expressions including comparison with nullable fields

Directory.Build.props

@@ -55,6 +55,7 @@
     <ProjectAssetsFile>$(MSBuildProjectExtensionsPath)project.assets.json</ProjectAssetsFile>
     <ProjectAssetsCacheFile>$(MSBuildProjectExtensionsPath)$(MSBuildProjectName).assets.cache</ProjectAssetsCacheFile>
     <OrmKeyFile>$(SolutionDir)Orm\Orm.snk</OrmKeyFile>
+	<NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <!-- Populate standard properties. -->

Extensions/Xtensive.Orm.BulkOperations/NugetContent/ReadMe.md

@@ -0,0 +1,93 @@
+Xtensive.Orm.BulkOperations
+===========================
+
+Summary
+-------
+The extension provides a set of IQueryable extension methods that are translated 
+to server-side UPDATE or DELETE commands.
+
+Prerequisites
+-------------
+DataObjects.Net 6.0.x (http://dataobjects.net)
+
+
+Examples of usage
+-----------------
+
+**Example #1**. Update primitive property with a constant value:
+
+```csharp
+  session.Query.All<Bar>()
+    .Where(a => a.Id == 1)
+    .Set(a => a.Count, 2)
+    Update();
+```
+
+**Example #2** Updating persistent property with expression, computed on server:
+
+```csharp
+  session.Query.All<Bar>()
+    .Where(a => a.Id==1)
+    .Set(a => a.Count, a => a.Description.Length)
+    .Update();
+```
+
+**Example #3**. Setting a reference to an entity that is already loaded into current Session
+
+```csharp
+  // Emulating entity loading
+  var bar = session.Query.Single<Bar>(1);
+
+  session.Query.All<Foo>()
+    .Where(a => a.Id == 2)
+    .Set(a => a.Bar, bar)
+    .Update();
+```
+
+**Example #4**. Setting a reference to an entity that is not loaded into Session, 1st way
+
+```csharp
+  session.Query.All<Foo>()
+    .Where(a => a.Id == 1)
+    .Set(a => a.Bar, a => Query.Single<Bar>(1))
+    .Update();
+```
+
+**Example #5**. Setting a reference to an entity that is not loaded into Session, 2nd way
+
+```csharp
+  session.Query.All<Foo>()
+    .Where(a => a.Id == 1)
+    .Set(a => a.Bar, a => Query.All<Bar>().Single(b => b.Name == "test"))
+    .Update();
+```
+
+**Example #6**. Constructing update expressions of the fly
+
+```csharp
+  bool condition = CheckCondition();
+  var query = session.Query.All()<Bar>
+    .Where(a => a.Id == 1)
+    .Set(a => a.Count, 2);
+
+  if(condition)
+    query = query.Set(a => a.Name, a => a.Name + "test");
+  query.Update();
+```
+
+**Example #7**. Updating lots of properties at once
+
+```csharp
+  session.Query.All<Bar>()
+    .Where(a => a.Id == 1)
+    Update(
+      a => new Bar(null) { Count = 2, Name = a.Name + "test", /*dozens of other properties...*/ });
+```
+
+**Example #8**. Deleting entities
+
+```csharp
+  session.Query.All<Foo>()
+    .Where(a => a.Id == 1)
+    .Delete();
+```

Extensions/Xtensive.Orm.BulkOperations/Readme.txt

@@ -12,8 +12,13 @@
     <AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
-  <ItemGroup>
-    <None Include="Readme.txt" />
+  <PropertyGroup Label="Nuget ReadMe" Condition="$(GeneratePackageOnBuild) == 'true'">
+    <PackageReadmeFile>ReadMe.md</PackageReadmeFile>
+  </PropertyGroup>
+  <ItemGroup Label="Nuget content">
+    <Content Include="$(ProjectDir)NuGetContent\**">
+      <PackagePath>.</PackagePath>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />

Extensions/Xtensive.Orm.BulkOperations/Xtensive.Orm.BulkOperations.csproj

@@ -1,4 +1,3 @@
-=========================
 Xtensive.Orm.Localization
 =========================
 
@@ -9,35 +8,14 @@ This implies that localizable resources are a part of domain model so they are s
 
 Prerequisites
 -------------
-DataObjects.Net Core 0.1 or later (http://dataobjects.net)
+DataObjects.Net 6.0.x or later (http://dataobjects.net)
 
 Implementation
 --------------
-1. Add reference to Xtensive.Orm.Localization assembly
-2. Include types from Xtensive.Orm.Localization assembly into the domain:
-
-  <Xtensive.Orm>
-    <domains>
-      <domain ... >
-        <types>
-          <add assembly="your assembly"/>
-          <add assembly="Xtensive.Orm.Localization"/>
-        </types>
-      </domain>
-    </domains>
-  </Xtensive.Orm>
-
-  2.1 Optionally add default localization configuration
-  <configSections>
-    <section name="Xtensive.Orm.Localization" type="Xtensive.Orm.Localization.Configuration.ConfigurationSection, Xtensive.Orm.Localization"/>
-  </configSections>
-
-  <Xtensive.Orm.Localization>
-    <defaultCulture name="es-ES"/>
-  </Xtensive.Orm.Localization>
-
-3. Implement ILocalizable<TLocalization> on your localizable entities, e.g.:
 
+Implement ILocalizable<TLocalization> on your localizable entities, e.g.:
+
+```csharp
   [HierarchyRoot]
   public class Page : Entity, ILocalizable<PageLocalization>
   {
@@ -56,9 +34,11 @@ Implementation
 
     public Page(Session session) : base(session) {}
   }
+```
 
-4. Define corresponding localizations, e.g.:
+Define corresponding localizations, e.g.:
 
+```csharp
   [HierarchyRoot]
   public class PageLocalization : Localization<Page>
   {
@@ -68,42 +48,53 @@ Implementation
     public PageLocalization(Session session, CultureInfo culture, Page target)
       : base(session, culture, target) {}
   }
+```
+
+Examples of usage
+-----------------
 
-Demo
-----
-1. Access localizable properties as regular ones, e.g.:
+**Example #1**. Access localizable properties as regular ones, e.g.:
 
+```csharp
   page.Title = "Welcome";
   string title = page.Title;
+```
 
-2. Mass editing of localizable properties:
+**Example #2**. Mass editing of localizable properties:
 
+```csharp
   var en = new CultureInfo("en-US");
   var sp = new CultureInfo("es-ES");
   var page = new Page(session);
   page.Localizations[en].Title = "Welcome";
   page.Localizations[sp].Title = "Bienvenido";
+```
 
-3. Value of localizable properties reflects culture of the current Thread, e.g.:
+**Example #3**. Value of localizable properties reflects culture of the current Thread, e.g.:
 
+```csharp
   Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US");
   string title = page.Title; // title is "Welcome"
 
   Thread.CurrentThread.CurrentCulture = new CultureInfo("es-ES");
   string title = page.Title; // title is "Bienvenido"
+```
 
-4. Instead of altering CurrentThread, instance of LocalizationScope can be used, e.g.:
+**Example #4**. Instead of altering CurrentThread, instance of LocalizationScope can be used, e.g.:
 
+```csharp
   using (new LocalizationScope(new CultureInfo("en-US"))) {
     string title = page.Title; // title is "Welcome"
   }
 
   using (new LocalizationScope(new CultureInfo("es-ES"))) {
     string title = page.Title; // title is "Bienvenido"
   }
+```
 
-5. LINQ queries that include localizable properties are transparently translated
+**Example #5**. LINQ queries that include localizable properties are transparently translated
 
+```csharp
   Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US");
   var query = from p in session.Query.All<Page>()
     where p.Title=="Welcome"
@@ -115,8 +106,4 @@ Demo
     where p.Title=="Bienvenido"
     select p;
   Assert.AreEqual(1, query.Count());
-
-
-References
-----------
-http://doextensions.codeplex.com
+```

…ons/Xtensive.Orm.Localization/Readme.txt ….Orm.Localization/NugetContent/ReadMe.mdExtensions/Xtensive.Orm.Localization/Readme.txt renamed to Extensions/Xtensive.Orm.Localization/NugetContent/ReadMe.md Extensions/Xtensive.Orm.Localization/Readme.txt renamed to Extensions/Xtensive.Orm.Localization/NugetContent/ReadMe.md

@@ -11,12 +11,17 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
+  <PropertyGroup Label="Nuget ReadMe" Condition="$(GeneratePackageOnBuild) == 'true'">
+    <PackageReadmeFile>ReadMe.md</PackageReadmeFile>
+  </PropertyGroup>
+  <Import Project="..\..\MSBuild\DataObjects.Net.InternalBuild.targets" />
   <ItemGroup>
     <ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Readme.txt" />
+  <ItemGroup Label="Nuget content">
+    <Content Include="$(ProjectDir)NuGetContent\**">
+      <PackagePath>.</PackagePath>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />

Extensions/Xtensive.Orm.Localization/Xtensive.Orm.Localization.csproj

@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2020 Xtensive LLC.
+// Copyright (C) 2013-2023 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Dmitri Maximov

Extensions/Xtensive.Orm.Logging.NLog/Log.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2020 Xtensive LLC.
+// Copyright (C) 2013-2023 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Dmitri Maximov