This is an automated email from the ASF dual-hosted git repository.
nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git
The following commit(s) were added to refs/heads/master by this push:
new 74917461a Fix for net461 dependency conflict after upgrading
Newtonsoft.Json. Fixes #699.
74917461a is described below
commit 74917461aa1498f23fbdf876a94f8bf5a8a6e89e
Author: Shad Storhaug <[email protected]>
AuthorDate: Thu Oct 20 02:04:28 2022 +0700
Fix for net461 dependency conflict after upgrading Newtonsoft.Json. Fixes
#699.
---
.build/TestReferences.Common.targets | 29 +-----------------
.build/dependencies.props | 6 ++--
.../Lucene.Net.TestFramework.csproj | 34 ++--------------------
.../Lucene.Net.Tests.Analysis.SmartCn.csproj | 2 --
.../Lucene.Net.Tests.Benchmark.csproj | 2 --
5 files changed, 5 insertions(+), 68 deletions(-)
diff --git a/.build/TestReferences.Common.targets
b/.build/TestReferences.Common.targets
index 6ec0ad4e1..3811a42fd 100644
--- a/.build/TestReferences.Common.targets
+++ b/.build/TestReferences.Common.targets
@@ -26,34 +26,7 @@
<PackageReference Include="NUnit3TestAdapter"
Version="$(NUnit3TestAdapterPackageVersion)" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
- <PackageReference
Include="Microsoft.Extensions.Configuration.Abstractions"
Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
- <PackageReference Include="Microsoft.Extensions.Configuration"
Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
- <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine"
Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
- <PackageReference
Include="Microsoft.Extensions.Configuration.EnvironmentVariables"
Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
- <PackageReference
Include="Microsoft.Extensions.Configuration.FileExtensions"
Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
- <PackageReference Include="Microsoft.Extensions.Configuration.Json"
Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
- <PackageReference Include="Microsoft.Extensions.Configuration.Xml"
Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
- <PackageReference Include="System.Net.Primitives"
Version="$(SystemNetPrimitivesPackageVersion)" />
- </ItemGroup>
-
- <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
- <PackageReference
Include="Microsoft.Extensions.Configuration.Abstractions"
Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
- <PackageReference Include="Microsoft.Extensions.Configuration"
Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
- <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine"
Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
- <PackageReference
Include="Microsoft.Extensions.Configuration.EnvironmentVariables"
Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
- <PackageReference
Include="Microsoft.Extensions.Configuration.FileExtensions"
Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
- <PackageReference Include="Microsoft.Extensions.Configuration.Json"
Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
- <PackageReference Include="Microsoft.Extensions.Configuration.Xml"
Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
- </ItemGroup>
-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
- <PackageReference
Include="Microsoft.Extensions.Configuration.Abstractions"
Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
- <PackageReference Include="Microsoft.Extensions.Configuration"
Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
- <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine"
Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
- <PackageReference
Include="Microsoft.Extensions.Configuration.EnvironmentVariables"
Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
- <PackageReference
Include="Microsoft.Extensions.Configuration.FileExtensions"
Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
- <PackageReference Include="Microsoft.Extensions.Configuration.Json"
Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
- <PackageReference Include="Microsoft.Extensions.Configuration.Xml"
Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
+ <PackageReference Include="System.Runtime.CompilerServices.Unsafe"
Version="$(SystemRuntimeCompilerServicesUnsafePackageVersion)" />
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/.build/dependencies.props b/.build/dependencies.props
index 9cc71a142..7a9ad2f27 100644
--- a/.build/dependencies.props
+++ b/.build/dependencies.props
@@ -48,9 +48,7 @@
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftCodeAnalysisVisualBasicPackageVersion>2.6.1</MicrosoftCodeAnalysisVisualBasicPackageVersion>
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>$(MicrosoftCodeAnalysisVisualBasicPackageVersion)</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
-
<MicrosoftExtensionsConfigurationPackageVersion>2.0.0</MicrosoftExtensionsConfigurationPackageVersion>
- <MicrosoftExtensionsConfigurationPackageVersion Condition="
$(TargetFramework.StartsWith('net45'))
">1.1.2</MicrosoftExtensionsConfigurationPackageVersion>
- <MicrosoftExtensionsConfigurationPackageVersion Condition="
$(TargetFramework.StartsWith('netcoreapp'))
">3.0.0</MicrosoftExtensionsConfigurationPackageVersion>
+
<MicrosoftExtensionsConfigurationPackageVersion>3.1.0</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>$(MicrosoftExtensionsConfigurationPackageVersion)</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>$(MicrosoftExtensionsConfigurationPackageVersion)</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>$(MicrosoftExtensionsConfigurationPackageVersion)</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
@@ -75,10 +73,10 @@
<RandomizedTestingGeneratorsPackageVersion>2.7.8</RandomizedTestingGeneratorsPackageVersion>
<SharpZipLibPackageVersion>1.1.0</SharpZipLibPackageVersion>
<Spatial4nPackageVersion>0.4.1.1</Spatial4nPackageVersion>
-
<SystemNetPrimitivesPackageVersion>4.3.0</SystemNetPrimitivesPackageVersion>
<SystemReflectionEmitPackageVersion>4.3.0</SystemReflectionEmitPackageVersion>
<SystemReflectionEmitILGenerationPackageVersion>4.3.0</SystemReflectionEmitILGenerationPackageVersion>
<SystemReflectionTypeExtensionsPackageVersion>4.3.0</SystemReflectionTypeExtensionsPackageVersion>
+
<SystemRuntimeCompilerServicesUnsafePackageVersion>5.0.0</SystemRuntimeCompilerServicesUnsafePackageVersion>
<SystemRuntimeInteropServicesRuntimeInformationPackageVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>4.7.0</SystemSecurityCryptographyXmlPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>4.3.0</SystemTextEncodingCodePagesPackageVersion>
diff --git a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
index eed1fc0f7..712ec3b0e 100644
--- a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
+++ b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
@@ -57,43 +57,13 @@
<ItemGroup>
<PackageReference Include="J2N" Version="$(J2NPackageVersion)" />
- <PackageReference Include="NUnit" Version="$(NUnitPackageVersion)" />
- <PackageReference Include="RandomizedTesting.Generators"
Version="$(RandomizedTestingGeneratorsPackageVersion)" />
- </ItemGroup>
-
- <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
- <PackageReference
Include="Microsoft.Extensions.Configuration.Abstractions"
Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
- <PackageReference Include="Microsoft.Extensions.Configuration"
Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
- <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine"
Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
- <PackageReference
Include="Microsoft.Extensions.Configuration.EnvironmentVariables"
Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)"
/>
- <PackageReference Include="Microsoft.Extensions.Configuration.Json"
Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
- <PackageReference Include="Microsoft.Extensions.Configuration.Xml"
Version="$(MicrosoftExtensionsConfigurationXmlPackageVersion)" />
- </ItemGroup>
-
- <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
- <PackageReference Include="Microsoft.Extensions.Configuration"
Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
- <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine"
Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
- <PackageReference
Include="Microsoft.Extensions.Configuration.EnvironmentVariables"
Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)"
/>
- <PackageReference Include="Microsoft.Extensions.Configuration.Json"
Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
- <PackageReference Include="Microsoft.Extensions.Configuration.Xml"
Version="$(MicrosoftExtensionsConfigurationXmlPackageVersion)" />
- </ItemGroup>
-
- <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
- <PackageReference Include="Microsoft.Extensions.Configuration"
Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
- <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine"
Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
- <PackageReference
Include="Microsoft.Extensions.Configuration.EnvironmentVariables"
Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)"
/>
- <PackageReference Include="Microsoft.Extensions.Configuration.Json"
Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
- <PackageReference Include="Microsoft.Extensions.Configuration.Xml"
Version="$(MicrosoftExtensionsConfigurationXmlPackageVersion)" />
- <PackageReference Include="System.Security.Cryptography.Xml"
Version="$(SystemSecurityCryptographyXmlPackageVersion)" />
- </ItemGroup>
-
- <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
<PackageReference Include="Microsoft.Extensions.Configuration"
Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine"
Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
<PackageReference
Include="Microsoft.Extensions.Configuration.EnvironmentVariables"
Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)"
/>
<PackageReference Include="Microsoft.Extensions.Configuration.Json"
Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Xml"
Version="$(MicrosoftExtensionsConfigurationXmlPackageVersion)" />
- <PackageReference Include="Newtonsoft.Json"
Version="$(NewtonsoftJsonPackageVersion)" />
+ <PackageReference Include="NUnit" Version="$(NUnitPackageVersion)" />
+ <PackageReference Include="RandomizedTesting.Generators"
Version="$(RandomizedTestingGeneratorsPackageVersion)" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
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 ab005d35a..0a455525f 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
@@ -60,12 +60,10 @@
<Import Project="$(SolutionDir).build/TestReferences.Common.targets" />
<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
- <PackageReference
Include="Microsoft.Extensions.DependencyInjection.Abstractions"
Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)"/>
<PackageReference Include="Microsoft.Extensions.Options"
Version="$(MicrosoftExtensionsOptionsPackageVersion)"/>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
- <PackageReference
Include="Microsoft.Extensions.DependencyInjection.Abstractions"
Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)"/>
<PackageReference Include="Microsoft.Extensions.Options"
Version="$(MicrosoftExtensionsOptionsPackageVersion)"/>
<PackageReference Include="System.Text.Encoding.CodePages"
Version="$(SystemTextEncodingCodePagesPackageVersion)" />
</ItemGroup>
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 1019c8731..3763508ed 100644
--- a/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj
+++ b/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj
@@ -88,12 +88,10 @@
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
- <PackageReference
Include="Microsoft.Extensions.DependencyInjection.Abstractions"
Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)"/>
<PackageReference Include="Microsoft.Extensions.Options"
Version="$(MicrosoftExtensionsOptionsPackageVersion)"/>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
- <PackageReference
Include="Microsoft.Extensions.DependencyInjection.Abstractions"
Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)"/>
<PackageReference Include="Microsoft.Extensions.Options"
Version="$(MicrosoftExtensionsOptionsPackageVersion)"/>
</ItemGroup>
