feat: add .NET Stanard 2.0 target

hazzik · hazzik · commit 797afdb3f725 · 2022-10-03T18:28:22.000+13:00
diff --git a/.gitignore b/.gitignore
@@ -47,3 +47,4 @@ lucenedirs/
 slave/
 master/
 indextemp/
+filehelperdest/
diff --git a/src/NHibernate.Search.Tests/Bridge/Cloud.cs b/src/NHibernate.Search.Tests/Bridge/Cloud.cs
@@ -1,8 +1,9 @@
 using System;
-using NHibernate.Search.Attributes;
 
 namespace NHibernate.Search.Tests.Bridge
 {
+    using Attributes;
+
     [Indexed]
     public class Cloud
     {
diff --git a/src/NHibernate.Search.Tests/Bridge/Department.cs b/src/NHibernate.Search.Tests/Bridge/Department.cs
@@ -1,10 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using NHibernate.Search.Attributes;
-
 namespace NHibernate.Search.Tests.Bridge
 {
+    using Attributes;
+
     [Indexed]
     [ClassBridge(typeof(CatFieldsClassBridge),
                 Name="branchnetwork", 
diff --git a/src/NHibernate.Search.Tests/Bridge/UnresolvedBridgeTest.cs b/src/NHibernate.Search.Tests/Bridge/UnresolvedBridgeTest.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using NHibernate.Cfg;
 using NHibernate.Search.Store;
+using NHibernate.Test;
 using NUnit.Framework;
 
 namespace NHibernate.Search.Tests.Bridge
@@ -18,7 +19,7 @@ protected override IEnumerable<string> Mappings
         public void SystemTypeForDocumentId()
         {
             Configuration tempCfg = new Configuration();
-            tempCfg.Configure();
+            tempCfg.Configure(TestConfigurationHelper.GetDefaultConfigurationFilePath());
             tempCfg.SetProperty("hibernate.search.default.directory_provider", typeof(RAMDirectoryProvider).AssemblyQualifiedName);
             tempCfg.AddClass(typeof(Gangster));
 			Assert.Throws<HibernateException>(()=>tempCfg.BuildSessionFactory(),"Unable to guess IFieldBridge for Id");
diff --git a/src/NHibernate.Search.Tests/DirectoryProvider/SnowStorm.cs b/src/NHibernate.Search.Tests/DirectoryProvider/SnowStorm.cs
@@ -1,9 +1,9 @@
 using System;
 
-using NHibernate.Search.Attributes;
-
 namespace NHibernate.Search.Tests.DirectoryProvider
 {
+    using Attributes;
+
     [Indexed]
     public class SnowStorm
     {
diff --git a/src/NHibernate.Search.Tests/Embedded/DoubleInsert/Address.cs b/src/NHibernate.Search.Tests/Embedded/DoubleInsert/Address.cs
@@ -1,8 +1,9 @@
 using System;
-using NHibernate.Search.Attributes;
 
 namespace NHibernate.Search.Tests.Embedded.DoubleInsert
 {
+    using Attributes;
+
     [Indexed]
     public class Address
     {
diff --git a/src/NHibernate.Search.Tests/Filter/Driver.cs b/src/NHibernate.Search.Tests/Filter/Driver.cs
@@ -1,8 +1,9 @@
 using System;
-using NHibernate.Search.Attributes;
 
 namespace NHibernate.Search.Tests.Filter
 {
+    using Attributes;
+
     [Indexed]
     [FullTextFilterDef("bestDriver", typeof(BestDriversFilter))] // Actual Filter implementation
     [FullTextFilterDef("security", typeof(SecurityFilterFactory))] // Filter factory with parameters
diff --git a/src/NHibernate.Search.Tests/NHibernate.Search.Tests.csproj b/src/NHibernate.Search.Tests/NHibernate.Search.Tests.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFrameworks>net461;net6.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="**/*.hbm.xml" />
@@ -17,4 +17,7 @@
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
+  </ItemGroup>
 </Project>
diff --git a/src/NHibernate.Search.Tests/Query/AlternateBook.cs b/src/NHibernate.Search.Tests/Query/AlternateBook.cs
@@ -1,8 +1,9 @@
 using System;
-using NHibernate.Search.Attributes;
 
 namespace NHibernate.Search.Tests.Query 
 {
+    using Attributes;
+
     [Indexed(Index = "Book")]
     public class AlternateBook 
     {
diff --git a/src/NHibernate.Search.Tests/Query/Book.cs b/src/NHibernate.Search.Tests/Query/Book.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
-using Iesi.Collections.Generic;
-using NHibernate.Search.Attributes;
 
 namespace NHibernate.Search.Tests.Query
 {
+    using Attributes;
+
     [Indexed(Index = "Book")]
     public class Book
     {
diff --git a/src/NHibernate.Search.Tests/TestConfigurationHelper.cs b/src/NHibernate.Search.Tests/TestConfigurationHelper.cs
@@ -18,10 +18,17 @@ public static string GetDefaultConfigurationFilePath()
 		{
 			string baseDir = AppDomain.CurrentDomain.BaseDirectory;
 			string relativeSearchPath = AppDomain.CurrentDomain.RelativeSearchPath;
-			string binPath = relativeSearchPath == null ? baseDir : Path.Combine(baseDir, relativeSearchPath);
-			string fullPath = Path.Combine(binPath, Cfg.Configuration.DefaultHibernateCfgFileName);
-			return File.Exists(fullPath) ? fullPath : null;
-		}
+			string folder = relativeSearchPath == null ? baseDir : Path.Combine(baseDir, relativeSearchPath);
+            while (folder != null)
+            {
+                string current = Path.Combine(folder, Configuration.DefaultHibernateCfgFileName);
+                if (File.Exists(current))
+                    return current;
+                folder = Path.GetDirectoryName(folder);
+            }
+
+            return null;
+        }
 
 		/// <summary>
 		/// Standar Configuration for tests.
diff --git a/src/NHibernate.Search/NHibernate.Search.csproj b/src/NHibernate.Search/NHibernate.Search.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <LangVersion>9</LangVersion>
     <IncludeSymbols>True</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -20,11 +20,11 @@
     <EmbeddedResource Include="**/*.xsd" />
   </ItemGroup>
   <ItemGroup>
-	<PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00016" />
+    <PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00016" />
     <PackageReference Include="NHibernate" Version="5.3.13" />
     <PackageReference Include="Iesi.Collections" Version="4.0.4" />
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
     <Reference Include="System.Configuration" />
   </ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`using System;`
`2`		`-using NHibernate.Search.Attributes;`
`3`	`2`
`4`	`3`	`namespace NHibernate.Search.Tests.Bridge`
`5`	`4`	`{`
	`5`	`+ using Attributes;`
	`6`	`+`
`6`	`7`	`[Indexed]`
`7`	`8`	`public class Cloud`
`8`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`using System;`
`2`	`2`
`3`		`-using NHibernate.Search.Attributes;`
`4`		`-`
`5`	`3`	`namespace NHibernate.Search.Tests.DirectoryProvider`
`6`	`4`	`{`
	`5`	`+ using Attributes;`
	`6`	`+`
`7`	`7`	`[Indexed]`
`8`	`8`	`public class SnowStorm`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`		`-using Iesi.Collections.Generic;`
`4`		`-using NHibernate.Search.Attributes;`
`5`	`3`
`6`	`4`	`namespace NHibernate.Search.Tests.Query`
`7`	`5`	`{`
	`6`	`+ using Attributes;`
	`7`	`+`
`8`	`8`	`[Indexed(Index = "Book")]`
`9`	`9`	`public class Book`
`10`	`10`	`{`