diff --git a/.build/dependencies.props b/.build/dependencies.props index 091543206e..4be8d11f27 100644 --- a/.build/dependencies.props +++ b/.build/dependencies.props @@ -32,34 +32,31 @@ https://github.com/apache/lucene-solr/tree/31d7ec7bbfdcd2c4cc61d9d35e962165410b65fe/lucene/analysis/icu/src/data/utr30 Just make sure they are adjusted to the right version of ICU/Lucene. [60.1,60.2) --> - 60.1.0-alpha.356 - $(ICU4NPackageVersion) - $(ICU4NPackageVersion) - $(ICU4NPackageVersion) - $(ICU4NPackageVersion) - $(ICU4NPackageVersion) + [60.1.0-alpha.436] 8.7.5 1.6.7 - 2.0.0 + + [2.1.0, 3.0.0) 1.0.9 - 2.0.0 - 5.0.0 - 2.0.0 + 2.1.1 + 2.1.34 + 6.0.0 + 2.1.1 + 3.1.32 2.9.8 2.6.1 $(MicrosoftCodeAnalysisCSharpPackageVersion) 2.6.1 $(MicrosoftCodeAnalysisVisualBasicPackageVersion) - 3.1.6 + 8.0.0 $(MicrosoftExtensionsConfigurationPackageVersion) $(MicrosoftExtensionsConfigurationPackageVersion) $(MicrosoftExtensionsConfigurationPackageVersion) - $(MicrosoftExtensionsConfigurationPackageVersion) - $(MicrosoftExtensionsConfigurationPackageVersion) - 2.0.0 - $(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion) - 2.0.0 - 1.0.2 + 8.0.1 + 8.0.1 + 8.0.0 + 8.0.1 + 1.0.3 17.9.0 1.1.1 $(MicrosoftSourceLinkAzureReposGitPackageReferenceVersion) @@ -73,16 +70,18 @@ 2.7.8 1.4.2 0.4.1.1 + 8.0.0 4.5.5 + 4.3.4 4.3.0 4.3.0 4.3.0 - 6.0.0 4.3.0 - 6.0.1 4.3.0 5.0.0 - 6.0.6 + 8.0.0 + 6.0.10 + 4.3.1 6.1.0 diff --git a/Lucene.Net.sln b/Lucene.Net.sln index a7a55a7b3d..487e23f6fe 100644 --- a/Lucene.Net.sln +++ b/Lucene.Net.sln @@ -119,6 +119,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net", "src\Lucene.Net\Lucene.Net.csproj", "{3A0AA37E-2B7B-4416-B528-DA4E0E6A6706}" + ProjectSection(ProjectDependencies) = postProject + {441876AF-F691-408C-85EC-6A934E60F627} = {441876AF-F691-408C-85EC-6A934E60F627} + {5CD4D4E8-6132-4384-98FC-6AB1C97E0B80} = {5CD4D4E8-6132-4384-98FC-6AB1C97E0B80} + EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Analysis.Common", "src\Lucene.Net.Analysis.Common\Lucene.Net.Analysis.Common.csproj", "{3D0366A8-515D-44F0-835F-4118853CFA14}" EndProject @@ -284,7 +288,7 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "websites", "websites\", "{8 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{42599646-275F-4970-BC60-A3349F6498CC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LuceneDocsPlugins", "src\docs\LuceneDocsPlugins\LuceneDocsPlugins.csproj", "{FED4A824-1F32-4948-8D37-2B7610804DB5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LuceneDocsPlugins", "src\docs\LuceneDocsPlugins\LuceneDocsPlugins.csproj", "{FED4A824-1F32-4948-8D37-2B7610804DB5}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/NuGet.config b/NuGet.config index afae52770a..d475c20f86 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,4 +1,4 @@ - + + diff --git a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj index 762ae8571a..250ca43a37 100644 --- a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj +++ b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj @@ -53,7 +53,7 @@ - + diff --git a/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj b/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj index 60a437ce56..d32f09fd6e 100644 --- a/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj +++ b/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj @@ -46,6 +46,10 @@ + + + + diff --git a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj index 4eb51d734b..712ec3b0e2 100644 --- a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj +++ b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj @@ -66,11 +66,6 @@ - - - - - diff --git a/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj b/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj index 79d6f9a7ae..abe9d1c3cb 100644 --- a/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj +++ b/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj @@ -59,12 +59,7 @@ - - - - - diff --git a/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj b/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj index afca29a4b9..697304564c 100644 --- a/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj +++ b/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj @@ -87,12 +87,4 @@ - - - - - - - - diff --git a/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj b/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj index a518765489..a794ca372b 100644 --- a/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj +++ b/src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj @@ -67,6 +67,12 @@ + + + + + + diff --git a/src/Lucene.Net/Lucene.Net.csproj b/src/Lucene.Net/Lucene.Net.csproj index 2491eccf46..b04cb5b042 100644 --- a/src/Lucene.Net/Lucene.Net.csproj +++ b/src/Lucene.Net/Lucene.Net.csproj @@ -60,14 +60,15 @@ - - - - + + + + + diff --git a/src/dotnet/Lucene.Net.CodeAnalysis.CSharp/Lucene.Net.CodeAnalysis.CSharp.csproj b/src/dotnet/Lucene.Net.CodeAnalysis.CSharp/Lucene.Net.CodeAnalysis.CSharp.csproj index 2905dd3d80..a631150c12 100644 --- a/src/dotnet/Lucene.Net.CodeAnalysis.CSharp/Lucene.Net.CodeAnalysis.CSharp.csproj +++ b/src/dotnet/Lucene.Net.CodeAnalysis.CSharp/Lucene.Net.CodeAnalysis.CSharp.csproj @@ -34,6 +34,10 @@ + + + + diff --git a/src/dotnet/Lucene.Net.CodeAnalysis.VisualBasic/Lucene.Net.CodeAnalysis.VisualBasic.csproj b/src/dotnet/Lucene.Net.CodeAnalysis.VisualBasic/Lucene.Net.CodeAnalysis.VisualBasic.csproj index 6c2d113ec7..f76baceda0 100644 --- a/src/dotnet/Lucene.Net.CodeAnalysis.VisualBasic/Lucene.Net.CodeAnalysis.VisualBasic.csproj +++ b/src/dotnet/Lucene.Net.CodeAnalysis.VisualBasic/Lucene.Net.CodeAnalysis.VisualBasic.csproj @@ -34,6 +34,10 @@ + + + + diff --git a/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj b/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj index 3da8fcb3f4..827d421e01 100644 --- a/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj +++ b/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj @@ -72,11 +72,6 @@ - - - - - diff --git a/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj b/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj index 946defd1e3..e415034aaa 100644 --- a/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj +++ b/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj @@ -42,6 +42,9 @@ + + + diff --git a/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj b/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj index 94873e7db8..6666ad2193 100644 --- a/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj +++ b/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj @@ -77,19 +77,6 @@ - - - - - - - - - - - - - diff --git a/src/dotnet/tools/lucene-cli/lucene-cli.csproj b/src/dotnet/tools/lucene-cli/lucene-cli.csproj index 73a1446b07..53bf6cf839 100644 --- a/src/dotnet/tools/lucene-cli/lucene-cli.csproj +++ b/src/dotnet/tools/lucene-cli/lucene-cli.csproj @@ -77,7 +77,6 @@ -