still working on v1.8

Author: kellybirr

src/Unearth.Common/Unearth.Common.csproj

@@ -7,19 +7,6 @@
     <Version>1.7.2.1020</Version>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="DnsQuery.cs" />
-    <Compile Remove="DnsQueryAsync.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Unearth.Core\Unearth.Core.csproj" />
   </ItemGroup>

src/Unearth.Core/Dns/Linux/LDnsQuery.cs

@@ -5,7 +5,6 @@
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 
-#if (NETSTANDARD2_0)
 namespace Unearth.Dns.Linux
 {
     internal class LDnsQuery : IDnsQuery
@@ -253,4 +252,3 @@ public LDnsHeader(LDnsReader reader)
         public UInt16 DataLen { get; }
     }
 }
-#endif

src/Unearth.Core/StringValues.cs

@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 // ReSharper disable All
 
-#if (! NETSTANDARD2_0)
 namespace Unearth
 {
     /// <summary>
@@ -456,5 +455,4 @@ void IDisposable.Dispose()
 namespace Microsoft.Extensions.Primitives
 {
     // This prevents compile errors - don't delete it in the NetFX project
-}
-#endif
+}

src/Unearth.Core/Unearth.Core.csproj

@@ -7,8 +7,20 @@
     <Version>1.7.2.1020</Version>
   </PropertyGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
+    <Compile Remove="StringValues.cs" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net47'">
+    <Compile Remove="Dns\Linux\LDnsQuery.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Primitives" Version="2.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Dns\Linux\" />
+  </ItemGroup>
+
 </Project>

test/UnitTests/DatabaseTests.cs

@@ -15,7 +15,7 @@ public async Task SqlDatabase_Test()
             var locator = new DatabaseLocator(); // {ServiceDomain = "kmb.home"};
             Console.WriteLine("Testing in {0}", locator.ServiceDomain);
 
-            DatabaseService svc = await locator.Locate("onumbers-db", DatabaseProtocol.Sql);
+            DatabaseService svc = await locator.Locate("fluf-workflow-db", DatabaseProtocol.Sql);
             Assert.IsNotNull(svc);
 
             string[] connArray = svc.ConnectionStrings.ToArray();
@@ -25,7 +25,8 @@ public async Task SqlDatabase_Test()
                 Console.WriteLine(s);
 
             Assert.AreEqual(
-                "Server=tcp:dilbert7.kmb.home,1433;Database=Onumbers;Integrated Security=SSPI;",
+                "Server=tcp:vrdworkflow01.rnd.ipzo.net,1433;Database=WorkflowConfig;User ID=fluf_app;Password=Password1!;",
+                //"Server=tcp:dilbert7.kmb.home,1433;Database=Onumbers;Integrated Security=SSPI;",
                 //"Server=tcp:vrdlfadb01.rnd.ipzo.net,1433;Database=Onumbers;User ID=sa;Password=C4bb4g5;Applicaiton Name=kellyb;",
                 connArray[0]
                 );