From 5887f235ee794ac10e98a8166e3d1fe0182eb069 Mon Sep 17 00:00:00 2001
From: Seeland <168659+stesee@users.noreply.github.com>
Date: Mon, 24 Jun 2024 13:03:02 +0200
Subject: [PATCH 1/7] Fixed performance / cpu resource leak issue of
IndexReader
Dropped outdated sdk build dependencies
---
Lucene.Net.sln | 24 +-
NuGet.config | 5 +-
.../Lucene.Net.Analysis.Common.csproj | 2 +
.../Lucene.Net.Queries.csproj | 2 +
.../Lucene.Net.Spatial.csproj | 2 +
src/Lucene.Net/Index/IndexReader.cs | 14 +-
src/Lucene.Net/Lucene.Net.csproj | 230 +++++++++---------
.../Lucene.Net.Tests.CodeAnalysis.csproj | 2 +-
websites/Web.config | 14 ++
9 files changed, 152 insertions(+), 143 deletions(-)
create mode 100644 websites/Web.config
diff --git a/Lucene.Net.sln b/Lucene.Net.sln
index 7f6fa0562d..2944d8e185 100644
--- a/Lucene.Net.sln
+++ b/Lucene.Net.sln
@@ -1,22 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-VisualStudioVersion = 16.0.29806.167
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35004.147
MinimumVisualStudioVersion = 15.0.26730.8
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "azure-templates", "azure-templates", "{05CE3A39-40D4-452D-AFE0-E57E536A08C6}"
ProjectSection(SolutionItems) = preProject
@@ -41,10 +25,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".build", ".build", "{4016BD
build = build
build.bat = build.bat
build.ps1 = build.ps1
- .build\runbuild.ps1 = .build\runbuild.ps1
.build\dependencies.props = .build\dependencies.props
.build\nuget.props = .build\nuget.props
.build\release.targets = .build\release.targets
+ .build\runbuild.ps1 = .build\runbuild.ps1
.build\TestReferences.Common.targets = .build\TestReferences.Common.targets
TestTargetFramework.props = TestTargetFramework.props
EndProjectSection
@@ -263,7 +247,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Tests.AllProject
EndProject
Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "websites", "websites\", "{8988CDA4-8420-4BEE-869A-66825055EED2}"
ProjectSection(WebsiteProperties) = preProject
- TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.6.2"
+ TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.8"
Debug.AspNetCompiler.VirtualPath = "/localhost_59352"
Debug.AspNetCompiler.PhysicalPath = "websites\"
Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_59352\"
diff --git a/NuGet.config b/NuGet.config
index afae52770a..b9d6368297 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -1,4 +1,4 @@
-
+
-
-
-
diff --git a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
index 5a64acc9e1..bba4c425a8 100644
--- a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
+++ b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
@@ -25,6 +25,8 @@
Analyzers for indexing content in different languages and domains for the Lucene.NET full-text search engine library from The Apache Software Foundation.
analysis-common/overview.html
+ 4.9.0-finalizerFix
+ true
diff --git a/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj b/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj
index 90833c84bf..8d3507b26b 100644
--- a/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj
+++ b/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj
@@ -25,6 +25,8 @@
Extended Filters and Queries for the Lucene.NET full-text search engine library from The Apache Software Foundation.
queries/Lucene.Net.Queries.html
+ true
+ 4.9.0-finalizerFix
diff --git a/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj b/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj
index 616b22b98d..4245afad28 100644
--- a/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj
+++ b/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj
@@ -25,6 +25,8 @@
Geospatial search for the Lucene.NET full-text search engine library from The Apache Software Foundation.
spatial/Lucene.Net.Spatial.html
+ 4.9.0-finalizerFix
+ true
diff --git a/src/Lucene.Net/Index/IndexReader.cs b/src/Lucene.Net/Index/IndexReader.cs
index f8fa305276..f09b98eba1 100644
--- a/src/Lucene.Net/Index/IndexReader.cs
+++ b/src/Lucene.Net/Index/IndexReader.cs
@@ -3,9 +3,11 @@
using Lucene.Net.Support;
using Lucene.Net.Support.Threading;
using Lucene.Net.Util;
+
#if !FEATURE_CONDITIONALWEAKTABLE_ENUMERATOR
using Lucene.Net.Util.Events;
#endif
+
using System;
using System.Collections;
using System.Collections.Generic;
@@ -81,7 +83,7 @@ public abstract partial class IndexReader : IDisposable
private bool closedByChild = false;
private readonly AtomicInt32 refCount = new AtomicInt32(1);
- private protected IndexReader() // LUCENENET: Changed from internal to private protected
+ protected IndexReader() // LUCENENET: Changed from internal to private protected
{
if (!(this is CompositeReader || this is AtomicReader))
{
@@ -656,10 +658,10 @@ internal void SubscribeToGetCacheKeysEvent(WeakEvents.GetCacheKeysEvent getCache
}
// LUCENENET specific: Clean up the weak event handler if this class goes out of scope
- ~IndexReader()
- {
- Dispose(false);
- }
+ //~IndexReader()
+ //{
+ // Dispose(false);
+ //}
// LUCENENET specific: Add weak event handler for .NET Standard 2.0 and .NET Framework, since we don't have an enumerator to use
private void OnGetParentReaders(WeakEvents.GetParentReadersEventArgs e)
@@ -781,4 +783,4 @@ public interface IReaderDisposedListener
/// Invoked when the is disposed.
void OnDispose(IndexReader reader);
}
-}
\ No newline at end of file
+}
diff --git a/src/Lucene.Net/Lucene.Net.csproj b/src/Lucene.Net/Lucene.Net.csproj
index 2491eccf46..3ff1c70e91 100644
--- a/src/Lucene.Net/Lucene.Net.csproj
+++ b/src/Lucene.Net/Lucene.Net.csproj
@@ -21,117 +21,123 @@
-->
-
-
-
- net6.0;netstandard2.1;netstandard2.0;net462
-
- Lucene.Net
- Lucene.Net is a full-text search engine library capable of advanced text analysis, indexing, and searching. It can be used to easily add search capabilities to applications. Lucene.Net is a C# port of the popular Java Lucene search engine framework from The Apache Software Foundation, targeted at .NET Framework and .NET Core users.
-
-
- bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml
- $(NoWarn);1591;1573
-
- true
-
-
-
-
-
- $(SolutionDir)src\dotnet\
- $(LuceneNetDotNetDir)Lucene.Net.CodeAnalysis\tools\
- $(LuceneNetDotNetDir)\Lucene.Net.CodeAnalysis.CSharp\bin\$(Configuration)\netstandard1.3\*.dll
- $(LuceneNetDotNetDir)\Lucene.Net.CodeAnalysis.VisualBasic\bin\$(Configuration)\netstandard1.3\*.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ net6.0;netstandard2.1;netstandard2.0;net462
+
+ Lucene.Net
+ Lucene.Net is a full-text search engine library capable of advanced text analysis, indexing, and searching. It can be used to easily add search capabilities to applications. Lucene.Net is a C# port of the popular Java Lucene search engine framework from The Apache Software Foundation, targeted at .NET Framework and .NET Core users.
+
+
+ bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml
+ $(NoWarn);1591;1573
+ 4.9.0-finalizerFix
+ true
+ true
+ true
+ AllEnabledByDefault
+ latest
+
+
+
+
+
+ $(SolutionDir)src\dotnet\
+ $(LuceneNetDotNetDir)Lucene.Net.CodeAnalysis\tools\
+ $(LuceneNetDotNetDir)\Lucene.Net.CodeAnalysis.CSharp\bin\$(Configuration)\netstandard1.3\*.dll
+ $(LuceneNetDotNetDir)\Lucene.Net.CodeAnalysis.VisualBasic\bin\$(Configuration)\netstandard1.3\*.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj b/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj
index 768f84ad1b..3efbc4a207 100644
--- a/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj
+++ b/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj
@@ -22,7 +22,7 @@
- net5.0
+ net6.0
Lucene.Net.CodeAnalysis
false
diff --git a/websites/Web.config b/websites/Web.config
new file mode 100644
index 0000000000..74d24b9ec7
--- /dev/null
+++ b/websites/Web.config
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
\ No newline at end of file
From 3cad9c847a28e46b02d156a88c75c65ca01a8df1 Mon Sep 17 00:00:00 2001
From: Seeland <168659+stesee@users.noreply.github.com>
Date: Mon, 24 Jun 2024 15:24:56 +0200
Subject: [PATCH 2/7] Reverted changes to get it on my machine publishing nuget
packages
---
Lucene.Net.sln | 16 ++++++++++++++++
NuGet.config | 3 +++
.../Lucene.Net.Analysis.Common.csproj | 2 --
src/Lucene.Net.Queries/Lucene.Net.Queries.csproj | 2 --
src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj | 2 --
src/Lucene.Net/Index/IndexReader.cs | 6 ------
src/Lucene.Net/Lucene.Net.csproj | 9 ++-------
websites/Web.config | 14 --------------
8 files changed, 21 insertions(+), 33 deletions(-)
delete mode 100644 websites/Web.config
diff --git a/Lucene.Net.sln b/Lucene.Net.sln
index 2944d8e185..3c51015dc7 100644
--- a/Lucene.Net.sln
+++ b/Lucene.Net.sln
@@ -1,5 +1,21 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
VisualStudioVersion = 17.10.35004.147
MinimumVisualStudioVersion = 15.0.26730.8
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "azure-templates", "azure-templates", "{05CE3A39-40D4-452D-AFE0-E57E536A08C6}"
diff --git a/NuGet.config b/NuGet.config
index b9d6368297..7b3cf95765 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -20,4 +20,7 @@ under the License.
-->
+
+
+
diff --git a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
index bba4c425a8..5a64acc9e1 100644
--- a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
+++ b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
@@ -25,8 +25,6 @@
Analyzers for indexing content in different languages and domains for the Lucene.NET full-text search engine library from The Apache Software Foundation.
analysis-common/overview.html
- 4.9.0-finalizerFix
- true
diff --git a/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj b/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj
index 8d3507b26b..90833c84bf 100644
--- a/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj
+++ b/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj
@@ -25,8 +25,6 @@
Extended Filters and Queries for the Lucene.NET full-text search engine library from The Apache Software Foundation.
queries/Lucene.Net.Queries.html
- true
- 4.9.0-finalizerFix
diff --git a/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj b/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj
index 4245afad28..616b22b98d 100644
--- a/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj
+++ b/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj
@@ -25,8 +25,6 @@
Geospatial search for the Lucene.NET full-text search engine library from The Apache Software Foundation.
spatial/Lucene.Net.Spatial.html
- 4.9.0-finalizerFix
- true
diff --git a/src/Lucene.Net/Index/IndexReader.cs b/src/Lucene.Net/Index/IndexReader.cs
index f09b98eba1..b151a0a0e7 100644
--- a/src/Lucene.Net/Index/IndexReader.cs
+++ b/src/Lucene.Net/Index/IndexReader.cs
@@ -657,12 +657,6 @@ internal void SubscribeToGetCacheKeysEvent(WeakEvents.GetCacheKeysEvent getCache
getCacheKeysEvent.Subscribe(OnGetCacheKeys);
}
- // LUCENENET specific: Clean up the weak event handler if this class goes out of scope
- //~IndexReader()
- //{
- // Dispose(false);
- //}
-
// LUCENENET specific: Add weak event handler for .NET Standard 2.0 and .NET Framework, since we don't have an enumerator to use
private void OnGetParentReaders(WeakEvents.GetParentReadersEventArgs e)
{
diff --git a/src/Lucene.Net/Lucene.Net.csproj b/src/Lucene.Net/Lucene.Net.csproj
index 3ff1c70e91..8bfe18bcd2 100644
--- a/src/Lucene.Net/Lucene.Net.csproj
+++ b/src/Lucene.Net/Lucene.Net.csproj
@@ -32,12 +32,7 @@
bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml
$(NoWarn);1591;1573
- 4.9.0-finalizerFix
- true
true
- true
- AllEnabledByDefault
- latest
@@ -124,14 +119,14 @@
-
+
-
+
diff --git a/websites/Web.config b/websites/Web.config
deleted file mode 100644
index 74d24b9ec7..0000000000
--- a/websites/Web.config
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
From 74ea3d29b32426b30c7466567d672a669899f46f Mon Sep 17 00:00:00 2001
From: Seeland <168659+stesee@users.noreply.github.com>
Date: Mon, 24 Jun 2024 16:01:51 +0200
Subject: [PATCH 3/7] Fixed typo
---
src/Lucene.Net/Support/ObsoleteAPI/IndexReader.cs | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/Lucene.Net/Support/ObsoleteAPI/IndexReader.cs b/src/Lucene.Net/Support/ObsoleteAPI/IndexReader.cs
index 806fb58e6a..63716cdb67 100644
--- a/src/Lucene.Net/Support/ObsoleteAPI/IndexReader.cs
+++ b/src/Lucene.Net/Support/ObsoleteAPI/IndexReader.cs
@@ -39,6 +39,7 @@ public interface IReaderClosedListener
private sealed class ReaderCloseListenerWrapper : IReaderDisposedListener
{
private readonly IReaderClosedListener listener;
+
public ReaderCloseListenerWrapper(IReaderClosedListener listener)
{
this.listener = listener ?? throw new ArgumentNullException(nameof(listener));
@@ -47,7 +48,9 @@ public ReaderCloseListenerWrapper(IReaderClosedListener listener)
public void OnDispose(IndexReader reader) => listener.OnClose(reader);
public override bool Equals(object obj) => listener.Equals(obj);
+
public override int GetHashCode() => listener.GetHashCode();
+
public override string ToString() => listener.ToString();
}
@@ -57,7 +60,7 @@ public ReaderCloseListenerWrapper(IReaderClosedListener listener)
///
/// @lucene.experimental
///
- [Obsolete("Use AddReaderDisposedListerner method instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+ [Obsolete("Use AddReaderDisposedListener method instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
public void AddReaderClosedListener(IReaderClosedListener listener)
{
EnsureOpen();
@@ -69,7 +72,7 @@ public void AddReaderClosedListener(IReaderClosedListener listener)
///
/// @lucene.experimental
///
- [Obsolete("Use RemoveReaderDisposedListerner method instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+ [Obsolete("Use RemoveReaderDisposedListener method instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
public void RemoveReaderClosedListener(IReaderClosedListener listener)
{
EnsureOpen();
From d7e4fb09bfac95ce62c1f98b684f2061be144c47 Mon Sep 17 00:00:00 2001
From: Stefan Seeland <168659+stesee@users.noreply.github.com>
Date: Wed, 14 Aug 2024 16:48:12 +0200
Subject: [PATCH 4/7] Review findings
---
NuGet.config | 8 +-
src/Lucene.Net/Index/IndexReader.cs | 2 +-
src/Lucene.Net/Lucene.Net.csproj | 225 ++++++++++++++--------------
3 files changed, 117 insertions(+), 118 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index 7b3cf95765..afae52770a 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -1,4 +1,4 @@
-
+
-
-
-
+
+
+
diff --git a/src/Lucene.Net/Index/IndexReader.cs b/src/Lucene.Net/Index/IndexReader.cs
index b151a0a0e7..518cbde041 100644
--- a/src/Lucene.Net/Index/IndexReader.cs
+++ b/src/Lucene.Net/Index/IndexReader.cs
@@ -83,7 +83,7 @@ public abstract partial class IndexReader : IDisposable
private bool closedByChild = false;
private readonly AtomicInt32 refCount = new AtomicInt32(1);
- protected IndexReader() // LUCENENET: Changed from internal to private protected
+ private protected IndexReader() // LUCENENET: Changed from internal to private protected
{
if (!(this is CompositeReader || this is AtomicReader))
{
diff --git a/src/Lucene.Net/Lucene.Net.csproj b/src/Lucene.Net/Lucene.Net.csproj
index 8bfe18bcd2..2491eccf46 100644
--- a/src/Lucene.Net/Lucene.Net.csproj
+++ b/src/Lucene.Net/Lucene.Net.csproj
@@ -21,118 +21,117 @@
-->
-
-
-
- net6.0;netstandard2.1;netstandard2.0;net462
-
- Lucene.Net
- Lucene.Net is a full-text search engine library capable of advanced text analysis, indexing, and searching. It can be used to easily add search capabilities to applications. Lucene.Net is a C# port of the popular Java Lucene search engine framework from The Apache Software Foundation, targeted at .NET Framework and .NET Core users.
-
-
- bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml
- $(NoWarn);1591;1573
- true
-
-
-
-
-
- $(SolutionDir)src\dotnet\
- $(LuceneNetDotNetDir)Lucene.Net.CodeAnalysis\tools\
- $(LuceneNetDotNetDir)\Lucene.Net.CodeAnalysis.CSharp\bin\$(Configuration)\netstandard1.3\*.dll
- $(LuceneNetDotNetDir)\Lucene.Net.CodeAnalysis.VisualBasic\bin\$(Configuration)\netstandard1.3\*.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ net6.0;netstandard2.1;netstandard2.0;net462
+
+ Lucene.Net
+ Lucene.Net is a full-text search engine library capable of advanced text analysis, indexing, and searching. It can be used to easily add search capabilities to applications. Lucene.Net is a C# port of the popular Java Lucene search engine framework from The Apache Software Foundation, targeted at .NET Framework and .NET Core users.
+
+
+ bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml
+ $(NoWarn);1591;1573
+
+ true
+
+
+
+
+
+ $(SolutionDir)src\dotnet\
+ $(LuceneNetDotNetDir)Lucene.Net.CodeAnalysis\tools\
+ $(LuceneNetDotNetDir)\Lucene.Net.CodeAnalysis.CSharp\bin\$(Configuration)\netstandard1.3\*.dll
+ $(LuceneNetDotNetDir)\Lucene.Net.CodeAnalysis.VisualBasic\bin\$(Configuration)\netstandard1.3\*.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From 9f149abd7085219c38a23fe77eab9cfb67fc6af9 Mon Sep 17 00:00:00 2001
From: Stefan Seeland <168659+stesee@users.noreply.github.com>
Date: Wed, 14 Aug 2024 16:49:21 +0200
Subject: [PATCH 5/7] Update Lucene.Net.Tests.CodeAnalysis.csproj
---
.../Lucene.Net.Tests.CodeAnalysis.csproj | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj b/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj
index 3efbc4a207..6c5e8e0573 100644
--- a/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj
+++ b/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj
@@ -22,17 +22,13 @@
- net6.0
+ net8.0
Lucene.Net.CodeAnalysis
false
- true
+ true
true
-
-
- false
-
From 56630d1c599075a101b81f0aefe2c6e88cca0ffd Mon Sep 17 00:00:00 2001
From: Shad Storhaug
Date: Thu, 15 Aug 2024 20:27:50 +0700
Subject: [PATCH 6/7] publish-test-results-for-test-projects.yml: Updated
Lucene.Net.Tests.CodeAnalysis to publish tests for net8.0
---
.../azure-templates/publish-test-results-for-test-projects.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.build/azure-templates/publish-test-results-for-test-projects.yml b/.build/azure-templates/publish-test-results-for-test-projects.yml
index a113396c0e..ec2a1237da 100644
--- a/.build/azure-templates/publish-test-results-for-test-projects.yml
+++ b/.build/azure-templates/publish-test-results-for-test-projects.yml
@@ -74,7 +74,7 @@ steps:
- template: publish-test-results.yml
parameters:
testProjectName: 'Lucene.Net.Tests.CodeAnalysis'
- framework: 'net5.0' # Since condtions are not supported for templates, we check for the file existence within publish-test-results.yml
+ framework: 'net8.0' # Since condtions are not supported for templates, we check for the file existence within publish-test-results.yml
vsTestPlatform: '${{ parameters.vsTestPlatform }}'
osName: '${{ parameters.osName }}'
testResultsFormat: '${{ parameters.testResultsFormat }}'
From ec838a0a207947b1cbe6b964fc9d3f0fe7cdfe5c Mon Sep 17 00:00:00 2001
From: Shad Storhaug
Date: Thu, 15 Aug 2024 21:13:49 +0700
Subject: [PATCH 7/7] .github/workflows/Lucene-Net-Tests-CodeAnalysis.yml:
Updated to test on net8.0
---
.github/workflows/Lucene-Net-Tests-CodeAnalysis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/Lucene-Net-Tests-CodeAnalysis.yml b/.github/workflows/Lucene-Net-Tests-CodeAnalysis.yml
index 886a49b90d..8a06e864df 100644
--- a/.github/workflows/Lucene-Net-Tests-CodeAnalysis.yml
+++ b/.github/workflows/Lucene-Net-Tests-CodeAnalysis.yml
@@ -49,7 +49,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-latest]
- framework: [net5.0]
+ framework: [net8.0]
platform: [x64]
configuration: [Release]
exclude: