From c8c957972998caf6c5975ab70b2165b432a75668 Mon Sep 17 00:00:00 2001 From: Shannon Date: Thu, 2 May 2024 08:39:36 -0600 Subject: [PATCH] Bumps to LTS versions of .NET and dependencies. Uses FSDirectory.Open for all directory usages. --- src/Directory.Build.props | 4 ++-- src/Examine.Core/Examine.Core.csproj | 4 ++-- src/Examine.Host/Examine.csproj | 4 ++-- .../SyncedFileSystemDirectoryFactory.cs | 2 +- src/Examine.Lucene/Examine.Lucene.csproj | 2 +- .../Examine.Lucene/Index/LuceneIndexTests.cs | 2 +- src/Examine.Test/Examine.Test.csproj | 18 +++++++++--------- src/Examine.Web.Demo/Examine.Web.Demo.csproj | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 9a742353a..0462cd64f 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -8,7 +8,7 @@ snupkg - + https://github.com/Shazwazza/Examine @@ -22,7 +22,7 @@ 2.0.0 - net6.0;netstandard2.1;netstandard2.0 + net6.0;net8.0; latest diff --git a/src/Examine.Core/Examine.Core.csproj b/src/Examine.Core/Examine.Core.csproj index 9ca9e7ac8..ed5f925d5 100644 --- a/src/Examine.Core/Examine.Core.csproj +++ b/src/Examine.Core/Examine.Core.csproj @@ -16,8 +16,8 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/src/Examine.Host/Examine.csproj b/src/Examine.Host/Examine.csproj index 1109bfac0..0219c094a 100644 --- a/src/Examine.Host/Examine.csproj +++ b/src/Examine.Host/Examine.csproj @@ -10,12 +10,12 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Examine.Lucene/Directories/SyncedFileSystemDirectoryFactory.cs b/src/Examine.Lucene/Directories/SyncedFileSystemDirectoryFactory.cs index cdb3fdaf7..e59a35869 100644 --- a/src/Examine.Lucene/Directories/SyncedFileSystemDirectoryFactory.cs +++ b/src/Examine.Lucene/Directories/SyncedFileSystemDirectoryFactory.cs @@ -61,7 +61,7 @@ protected override Directory CreateDirectory(LuceneIndex luceneIndex, bool force IndexDeletionPolicy = new SnapshotDeletionPolicy(new KeepOnlyLastCommitDeletionPolicy()) })) using (var tempMainIndex = new LuceneIndex(_loggerFactory, luceneIndex.Name, new TempOptions(), tempMainIndexWriter)) - using (var tempLocalDirectory = new SimpleFSDirectory(localLuceneIndexFolder, LockFactory.GetLockFactory(localLuceneIndexFolder))) + using (var tempLocalDirectory = FSDirectory.Open(localLuceneIndexFolder, LockFactory.GetLockFactory(localLuceneIndexFolder))) using (var replicator = new ExamineReplicator(_loggerFactory, tempMainIndex, tempLocalDirectory, tempDir)) { if (forceUnlock) diff --git a/src/Examine.Lucene/Examine.Lucene.csproj b/src/Examine.Lucene/Examine.Lucene.csproj index fae4e7b99..17e4f7cca 100644 --- a/src/Examine.Lucene/Examine.Lucene.csproj +++ b/src/Examine.Lucene/Examine.Lucene.csproj @@ -29,7 +29,7 @@ 4.3.0 - 4.7.0 + 8.0.0 diff --git a/src/Examine.Test/Examine.Lucene/Index/LuceneIndexTests.cs b/src/Examine.Test/Examine.Lucene/Index/LuceneIndexTests.cs index d164b9287..124c8f22b 100644 --- a/src/Examine.Test/Examine.Lucene/Index/LuceneIndexTests.cs +++ b/src/Examine.Test/Examine.Lucene/Index/LuceneIndexTests.cs @@ -715,7 +715,7 @@ public void Index_Read_And_Write_Ensure_No_Errors_In_Async( var tempPath = Path.Combine(tempBasePath, Guid.NewGuid().ToString()); System.IO.Directory.CreateDirectory(tempPath); temp = new DirectoryInfo(tempPath); - directory = new SimpleFSDirectory(temp); + directory = FSDirectory.Open(temp); } try { diff --git a/src/Examine.Test/Examine.Test.csproj b/src/Examine.Test/Examine.Test.csproj index 39b6d109c..51e2436a5 100644 --- a/src/Examine.Test/Examine.Test.csproj +++ b/src/Examine.Test/Examine.Test.csproj @@ -11,7 +11,7 @@ - net7.0;net6.0; + net6.0;net8.0; false false @@ -53,21 +53,21 @@ - + 4.8.0-beta00016 - - - - - + + + + + 3.13.3 - + - + diff --git a/src/Examine.Web.Demo/Examine.Web.Demo.csproj b/src/Examine.Web.Demo/Examine.Web.Demo.csproj index 2a31a31ae..9ad26771c 100644 --- a/src/Examine.Web.Demo/Examine.Web.Demo.csproj +++ b/src/Examine.Web.Demo/Examine.Web.Demo.csproj @@ -7,7 +7,7 @@ - +