Raise public versions and update sn references.

SenseNet · Apr 11, 2022 · a27c398 · a27c398
1 parent 33e993c
commit a27c398
Show file tree

Hide file tree

Showing 17 changed files with 103 additions and 96 deletions.
diff --git a/...Net.Search.Lucene29.Centralized.Common/SenseNet.Search.Lucene29.Centralized.Common.csproj b/...Net.Search.Lucene29.Centralized.Common/SenseNet.Search.Lucene29.Centralized.Common.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>7.5.4.2</Version>
+    <Version>7.5.5</Version>
     <Company>Sense/Net Inc.</Company>
     <Description>Common service elements for the Central Lucene29 Search Engine for the sensenet platform.</Description>
     <Copyright>Copyright © Sense/Net Inc.</Copyright>
@@ -23,7 +23,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="SenseNet.Tools" Version="3.2.7" />
     <PackageReference Include="SenseNet.Security" Version="4.1.4" />
-    <PackageReference Include="SenseNet.Search" Version="2.4.9.2" />
+    <PackageReference Include="SenseNet.Search" Version="2.4.10" />
   </ItemGroup>
 
 </Project>
diff --git a/...ch.Lucene29.Centralized.GrpcClient/SenseNet.Search.Lucene29.Centralized.GrpcClient.csproj b/...ch.Lucene29.Centralized.GrpcClient/SenseNet.Search.Lucene29.Centralized.GrpcClient.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <Version>0.0.7.1</Version>
+    <Version>0.0.8</Version>
     <Company>Sense/Net Inc.</Company>
     <Description>Grpc service client for the Central Lucene29 Search Engine for the sensenet platform.</Description>
     <Copyright>Copyright © Sense/Net Inc.</Copyright>

diff --git a/....Lucene29.Centralized.GrpcService/SenseNet.Search.Lucene29.Centralized.GrpcService.csproj b/....Lucene29.Centralized.GrpcService/SenseNet.Search.Lucene29.Centralized.GrpcService.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UserSecretsId>d87b24d7-ed3a-48ac-9f93-0adbf878a1e4</UserSecretsId>
-    <Version>1.0.0.2</Version>
+    <Version>1.0.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,7 +17,7 @@
 
   <ItemGroup>
     <PackageReference Include="Grpc.AspNetCore" Version="2.27.0" />
-    <PackageReference Include="SenseNet.Search" Version="2.4.9.2" />
+    <PackageReference Include="SenseNet.Search" Version="2.4.10" />
     <PackageReference Include="SenseNet.Security.EFCSecurityStore" Version="3.0.3" />
     <PackageReference Include="SenseNet.Security.Messaging.RabbitMQ" Version="1.2.1" />
     <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />

diff --git a/src/SenseNet.Search.Lucene29.Centralized.GrpcService/Startup.cs b/src/SenseNet.Search.Lucene29.Centralized.GrpcService/Startup.cs
@@ -44,13 +44,15 @@ public void ConfigureServices(IServiceCollection services)
             // by the communication layer to route incoming client calls to the
             // index layer.
             services.AddSingleton<Index.SearchService>();
-
+
+            // [sensenet]: Set options for EFCSecurityDataProvider
+            services.AddOptions<SenseNet.Security.EFCSecurityStore.Configuration.DataOptions>()
+                .Configure<IOptions<ConnectionStringOptions>>((securityOptions, systemConnections) =>
+                    securityOptions.ConnectionString = systemConnections.Value.Security);
+
             // [sensenet] Security db and message providers.
             services.AddSenseNetSecurity()
-                .AddEFCSecurityDataProvider(options =>
-                {
-                    options.ConnectionString = ConnectionStrings.SecurityDatabaseConnectionString;
-                })
+                .AddEFCSecurityDataProvider()
                 .AddRabbitMqSecurityMessageProvider();
         }
 

diff --git a/...seNet.Search.Lucene29.Centralized.Index/SenseNet.Search.Lucene29.Centralized.Index.csproj b/...seNet.Search.Lucene29.Centralized.Index/SenseNet.Search.Lucene29.Centralized.Index.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>SenseNet.Search.Lucene29.Centralized.Index</AssemblyName>
     <RootNamespace>SenseNet.Search.Lucene29.Centralized.Index</RootNamespace>
-    <Version>2.1.4.2</Version>
+    <Version>2.1.5</Version>
     <Company>Sense/Net Inc.</Company>
     <Description>Index layer for the sensenet Centralized search engine implementation for Lucene29.</Description>
     <Copyright>Copyright © Sense/Net Inc.</Copyright>
@@ -21,11 +21,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SenseNet.Common" Version="7.5.4" />
+    <PackageReference Include="SenseNet.Common" Version="7.5.5" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="SenseNet.Security" Version="4.1.4" />
-    <PackageReference Include="SenseNet.Search" Version="2.4.9.2" />
+    <PackageReference Include="SenseNet.Search" Version="2.4.10" />
     <PackageReference Include="SenseNet.Search.Lucene29.Lucene.Net" Version="2.9.4.301" />
   </ItemGroup>
 

diff --git a/src/SenseNet.Search.Lucene29.Centralized/SenseNet.Search.Lucene29.Centralized.csproj b/src/SenseNet.Search.Lucene29.Centralized/SenseNet.Search.Lucene29.Centralized.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.4.4.3</Version>
+    <Version>1.4.5</Version>
     <Authors>kavics,tusmester</Authors>
     <Company>Sense/Net Inc.</Company>
     <Copyright>Copyright © Sense/Net Inc.</Copyright>
@@ -20,7 +20,7 @@
 
   <ItemGroup>
     <PackageReference Include="SenseNet.Tools" Version="3.2.7" />
-    <PackageReference Include="SenseNet.ContentRepository" Version="7.7.31.5" />
+    <PackageReference Include="SenseNet.ContentRepository" Version="7.7.32" />
     <PackageReference Include="SenseNet.Search.Lucene29.Lucene.Net" Version="2.9.4.301" />
     <PackageReference Include="System.ServiceModel.Primitives" Version="4.5.3" />
   </ItemGroup>

diff --git a/src/SenseNet.Search.Lucene29.Common/SenseNet.Search.Lucene29.Common.csproj b/src/SenseNet.Search.Lucene29.Common/SenseNet.Search.Lucene29.Common.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>7.4.6.3</Version>
+    <Version>7.4.7</Version>
     <Authors>kavics,tusmester</Authors>
     <Company>Sense/Net Inc.</Company>
     <Copyright>Copyright © Sense/Net Inc.</Copyright>
@@ -20,7 +20,7 @@
 
   <ItemGroup>
     <PackageReference Include="SenseNet.Tools" Version="3.2.7" />
-    <PackageReference Include="SenseNet.ContentRepository" Version="7.7.31.5" />
+    <PackageReference Include="SenseNet.ContentRepository" Version="7.7.32" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SenseNet.Search.Lucene29.Local/SenseNet.Search.Lucene29.Local.csproj b/src/SenseNet.Search.Lucene29.Local/SenseNet.Search.Lucene29.Local.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>7.4.5.3</Version>
+    <Version>7.4.6</Version>
     <Authors>kavics,tusmester</Authors>
     <Company>Sense/Net Inc.</Company>
     <Copyright>Copyright © Sense/Net Inc.</Copyright>
@@ -20,7 +20,7 @@
 
   <ItemGroup>
     <PackageReference Include="SenseNet.Tools" Version="3.2.7" />
-    <PackageReference Include="SenseNet.ContentRepository" Version="7.7.31.5" />
+    <PackageReference Include="SenseNet.ContentRepository" Version="7.7.32" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SenseNet.Search.Lucene29/SenseNet.Search.Lucene29.csproj b/src/SenseNet.Search.Lucene29/SenseNet.Search.Lucene29.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>SenseNet.Search.Lucene29</AssemblyName>
     <RootNamespace>SenseNet.Search.Lucene29</RootNamespace>
-    <Version>7.4.4.2</Version>
+    <Version>7.4.5</Version>
     <Company>Sense/Net Inc.</Company>
     <Description>Lucene29 library for the sensenet platform containing the core indexing layer that works with Lucene index files directly.</Description>
     <Copyright>Copyright © Sense/Net Inc.</Copyright>
@@ -25,7 +25,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="SenseNet.Tools" Version="3.2.7" />
     <PackageReference Include="SenseNet.Security" Version="4.1.4" />
-    <PackageReference Include="SenseNet.Search" Version="2.4.9.2" />
+    <PackageReference Include="SenseNet.Search" Version="2.4.10" />
     <PackageReference Include="SenseNet.Search.Lucene29.Lucene.Net" Version="2.9.4.301" />
   </ItemGroup>
 

diff --git a/src/Tests/CentralizedIndexBackupTester/CentralizedIndexBackupTester.csproj b/src/Tests/CentralizedIndexBackupTester/CentralizedIndexBackupTester.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="SenseNet.Security.EFCSecurityStore" Version="3.0.3" />
     <PackageReference Include="SenseNet.Security.Messaging.RabbitMQ" Version="1.2.1" />
-    <PackageReference Include="SenseNet.Services.Core" Version="0.0.30.4" />
+    <PackageReference Include="SenseNet.Services.Core" Version="0.0.31" />
     <PackageReference Include="System.Data.SqlClient" Version="4.5.1" />
     <PackageReference Include="System.ServiceModel.NetTcp" Version="4.7.0" />
   </ItemGroup>

diff --git a/src/Tests/CentralizedIndexBackupTester/Program.cs b/src/Tests/CentralizedIndexBackupTester/Program.cs
@@ -11,9 +11,7 @@
 using Microsoft.Extensions.Options;
 using SenseNet.Configuration;
 using SenseNet.ContentRepository;
-using SenseNet.ContentRepository.Search.Indexing;
 using SenseNet.ContentRepository.Storage;
-using SenseNet.ContentRepository.Storage.Data.MsSqlClient;
 using SenseNet.ContentRepository.Storage.Search;
 using SenseNet.Diagnostics;
 using SenseNet.Extensions.DependencyInjection;
@@ -23,10 +21,8 @@
 using SenseNet.Search.Querying;
 using SenseNet.Security.Configuration;
 using SenseNet.Security.EFCSecurityStore;
-using SenseNet.Security.EFCSecurityStore.Configuration;
 using SenseNet.Security.Messaging;
 using SenseNet.Security.Messaging.RabbitMQ;
-using SenseNet.Storage.Data.MsSqlClient;
 using DataOptions = SenseNet.Configuration.DataOptions;
 using File = System.IO.File;
 using Task = System.Threading.Tasks.Task;
@@ -78,40 +74,43 @@ static void Main(string[] args)
 
             var sender = new MessageSenderManager();
 
-            var connOptions = Options.Create(ConnectionStringOptions.GetLegacyConnectionStrings());
-            var dbInstallerOptions = Options.Create(new MsSqlDatabaseInstallationOptions());
-
-            var builder = new RepositoryBuilder()
-                .SetConsole(Console.Out)
-                .UseLogger(new SnFileSystemEventLogger())
-                .UseTracer(new SnFileSystemTracer())
-                .UseConfiguration(configuration)
-                .UseDataProvider(new MsSqlDataProvider(Options.Create(DataOptions.GetLegacyConfiguration()), connOptions,
-                    dbInstallerOptions,
-                    new MsSqlDatabaseInstaller(dbInstallerOptions, NullLoggerFactory.Instance.CreateLogger<MsSqlDatabaseInstaller>()),
-                    new MsSqlDataInstaller(connOptions, NullLoggerFactory.Instance.CreateLogger<MsSqlDataInstaller>()),
-                    NullLoggerFactory.Instance.CreateLogger<MsSqlDataProvider>()))
-                .UseSecurityDataProvider(new EFCSecurityDataProvider(sender, 
-                    Options.Create(new SenseNet.Security.EFCSecurityStore.Configuration.DataOptions()
-                    {
-                        ConnectionString = ConnectionStrings.ConnectionString
-                    }),
-                    NullLogger<EFCSecurityDataProvider>.Instance))
-                .UseSecurityMessageProvider(new RabbitMQMessageProvider(sender, 
-                    Options.Create(new MessagingOptions()),
-                    Options.Create(new RabbitMqOptions())))
-                .UseLucene29CentralizedSearchEngineWithGrpc(configuration["sensenet:search:service:address"], options =>
-                {
-                    // trust the server in a development environment
-                    options.HttpClient = new HttpClient(new HttpClientHandler
-                    {
-                        ServerCertificateCustomValidationCallback = (message, certificate2, arg3, arg4) => true
-                    });
-                    options.DisposeHttpClient = true;
-                })
-                .StartWorkflowEngine(false)
-                .DisableNodeObservers()
-                .UseTraceCategories(SnTrace.Categories.Select(x => x.Name).ToArray()) as RepositoryBuilder;
+            //UNDONE: Build services using the new API
+            throw new NotImplementedException("Build services using the new API");
+
+            //var connOptions = Options.Create(ConnectionStringOptions.GetLegacyConnectionStrings());
+            //var dbInstallerOptions = Options.Create(new MsSqlDatabaseInstallationOptions());
+
+            var builder = new RepositoryBuilder(null);
+            //    .SetConsole(Console.Out)
+            //    .UseLogger(new SnFileSystemEventLogger())
+            //    .UseTracer(new SnFileSystemTracer())
+            //    .UseConfiguration(configuration)
+            //    .UseDataProvider(new MsSqlDataProvider(Options.Create(DataOptions.GetLegacyConfiguration()), connOptions,
+            //        dbInstallerOptions,
+            //        new MsSqlDatabaseInstaller(dbInstallerOptions, NullLoggerFactory.Instance.CreateLogger<MsSqlDatabaseInstaller>()),
+            //        new MsSqlDataInstaller(connOptions, NullLoggerFactory.Instance.CreateLogger<MsSqlDataInstaller>()),
+            //        NullLoggerFactory.Instance.CreateLogger<MsSqlDataProvider>()))
+            //    .UseSecurityDataProvider(new EFCSecurityDataProvider(sender, 
+            //        Options.Create(new SenseNet.Security.EFCSecurityStore.Configuration.DataOptions()
+            //        {
+            //            ConnectionString = ConnectionStrings.ConnectionString
+            //        }),
+            //        NullLogger<EFCSecurityDataProvider>.Instance))
+            //    .UseSecurityMessageProvider(new RabbitMQMessageProvider(sender, 
+            //        Options.Create(new MessagingOptions()),
+            //        Options.Create(new RabbitMqOptions())))
+            //    .UseLucene29CentralizedSearchEngineWithGrpc(configuration["sensenet:search:service:address"], options =>
+            //    {
+            //        // trust the server in a development environment
+            //        options.HttpClient = new HttpClient(new HttpClientHandler
+            //        {
+            //            ServerCertificateCustomValidationCallback = (message, certificate2, arg3, arg4) => true
+            //        });
+            //        options.DisposeHttpClient = true;
+            //    })
+            //    .StartWorkflowEngine(false)
+            //    .DisableNodeObservers()
+            //    .UseTraceCategories(SnTrace.Categories.Select(x => x.Name).ToArray()) as RepositoryBuilder;
 
             using (Repository.Start(builder))
             {

diff --git a/src/Tests/IndexIntegrityChecker/IndexIntegrityChecker.csproj b/src/Tests/IndexIntegrityChecker/IndexIntegrityChecker.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.16" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="SenseNet.Security.EFCSecurityStore" Version="3.0.3" />
-    <PackageReference Include="SenseNet.Services.Core" Version="0.0.30.4" />
+    <PackageReference Include="SenseNet.Services.Core" Version="0.0.31" />
     <PackageReference Include="System.Data.SqlClient" Version="4.5.1" />
   </ItemGroup>
 

diff --git a/src/Tests/IndexIntegrityChecker/IntegrityChecker.cs b/src/Tests/IndexIntegrityChecker/IntegrityChecker.cs
@@ -718,7 +718,9 @@ private static async Task<TimestampData> GetTimestampDataForOneNodeIntegrityChec
 
             var sql = string.Format(checkNodeSql, path);
 
-            using var ctx = new MsSqlDataContext(ConnectionStrings.ConnectionString, 
+            //UNDONE: Build services using the new API
+            //using var ctx = new MsSqlDataContext(ConnectionStrings.ConnectionString, 
+            using var ctx = new MsSqlDataContext(string.Empty, 
                 DataOptions.GetLegacyConfiguration(), CancellationToken.None);
 
             return await ctx.ExecuteReaderAsync(sql, async (reader, cancel) =>
@@ -760,7 +762,9 @@ private static async Task<TimestampData[]> GetTimestampDataForRecursiveIntegrity
                     sql += " AND " + typeFilter;
             }
 
-            using var ctx = new MsSqlDataContext(ConnectionStrings.ConnectionString,
+            //UNDONE: Build services using the new API
+            //using var ctx = new MsSqlDataContext(ConnectionStrings.ConnectionString,
+            using var ctx = new MsSqlDataContext(string.Empty,
                 DataOptions.GetLegacyConfiguration(), CancellationToken.None);
 
             return await ctx.ExecuteReaderAsync(sql, async (reader, cancel) =>

diff --git a/src/Tests/IndexIntegrityChecker/Program.cs b/src/Tests/IndexIntegrityChecker/Program.cs
@@ -7,12 +7,10 @@
 using Microsoft.Extensions.Options;
 using SenseNet.Configuration;
 using SenseNet.ContentRepository;
-using SenseNet.ContentRepository.Storage.Data.MsSqlClient;
 using SenseNet.Diagnostics;
 using SenseNet.Extensions.DependencyInjection;
 using SenseNet.Security.EFCSecurityStore;
 using SenseNet.Security.Messaging;
-using SenseNet.Storage.Data.MsSqlClient;
 using File = System.IO.File;
 using Task = System.Threading.Tasks.Task;
 
@@ -55,28 +53,30 @@ private static void Main(/*string[] args*/)
 
         static void CheckIndexIntegrity(string indexDirectory, IConfiguration config)
         {
-            var connOptions = Options.Create(ConnectionStringOptions.GetLegacyConnectionStrings());
-            var dbInstallerOptions = Options.Create(new MsSqlDatabaseInstallationOptions());
-
-            var builder = new RepositoryBuilder()
-                .SetConsole(Console.Out)
-                .UseLogger(new SnFileSystemEventLogger())
-                .UseTracer(new SnFileSystemTracer())
-                .UseConfiguration(config)
-                .UseDataProvider(new MsSqlDataProvider(Options.Create(DataOptions.GetLegacyConfiguration()), connOptions,
-                        dbInstallerOptions,
-                        new MsSqlDatabaseInstaller(dbInstallerOptions, NullLoggerFactory.Instance.CreateLogger<MsSqlDatabaseInstaller>()),
-                        new MsSqlDataInstaller(connOptions, NullLoggerFactory.Instance.CreateLogger<MsSqlDataInstaller>()),
-                        NullLoggerFactory.Instance.CreateLogger<MsSqlDataProvider>()))
-                .UseSecurityDataProvider(new EFCSecurityDataProvider(
-                    new MessageSenderManager(),
-                    Options.Create(new SenseNet.Security.EFCSecurityStore.Configuration.DataOptions()
-                    {
-                        ConnectionString = ConnectionStrings.ConnectionString
-                    }),
-                    NullLogger<EFCSecurityDataProvider>.Instance))
-                .UseLucene29LocalSearchEngine(indexDirectory)
-                .UseTraceCategories(SnTrace.Categories.Select(x => x.Name).ToArray()) as RepositoryBuilder;
+            //var connOptions = Options.Create(ConnectionStringOptions.GetLegacyConnectionStrings());
+            //var dbInstallerOptions = Options.Create(new MsSqlDatabaseInstallationOptions());
+
+            //UNDONE: Build services using the new API
+            throw new NotImplementedException("Build services using the new API");
+            var builder = new RepositoryBuilder(null);
+                //.SetConsole(Console.Out)
+                //.UseLogger(new SnFileSystemEventLogger())
+                //.UseTracer(new SnFileSystemTracer())
+                //.UseConfiguration(config)
+                //.UseDataProvider(new MsSqlDataProvider(Options.Create(DataOptions.GetLegacyConfiguration()), connOptions,
+                //        dbInstallerOptions,
+                //        new MsSqlDatabaseInstaller(dbInstallerOptions, NullLoggerFactory.Instance.CreateLogger<MsSqlDatabaseInstaller>()),
+                //        new MsSqlDataInstaller(connOptions, NullLoggerFactory.Instance.CreateLogger<MsSqlDataInstaller>()),
+                //        NullLoggerFactory.Instance.CreateLogger<MsSqlDataProvider>()))
+                //.UseSecurityDataProvider(new EFCSecurityDataProvider(
+                //    new MessageSenderManager(),
+                //    Options.Create(new SenseNet.Security.EFCSecurityStore.Configuration.DataOptions()
+                //    {
+                //        ConnectionString = ConnectionStrings.ConnectionString
+                //    }),
+                //    NullLogger<EFCSecurityDataProvider>.Instance))
+                //.UseLucene29LocalSearchEngine(indexDirectory)
+                //.UseTraceCategories(SnTrace.Categories.Select(x => x.Name).ToArray()) as RepositoryBuilder;
 
             using (Repository.Start(builder))
             {

diff --git a/src/Tests/SenseNet.Search.Lucene29.Tests/Lucene29CompilerTests.cs b/src/Tests/SenseNet.Search.Lucene29.Tests/Lucene29CompilerTests.cs
@@ -24,11 +24,12 @@ public class Lucene29CompilerTests : TestBase
         [TestInitialize]
         public void Initialize()
         {
+            //UNDONE: Build services using the new API
             var searchManager = new SearchManager(null);
-            var builder = new RepositoryBuilder()
-                .UseSearchManager(searchManager)
-                .UseIndexManager(new IndexManager(null, searchManager))
-                .UseLucene29LocalSearchEngine();
+            //var builder = new RepositoryBuilder()
+            //    .UseSearchManager(searchManager)
+            //    .UseIndexManager(new IndexManager(null, searchManager))
+            //    .UseLucene29LocalSearchEngine();
         }
 
         [TestMethod, TestCategory("IR")] // 38 tests