Use targetting pack and made sure canary works under linux too

Author: Mpdreamz

build/scripts/Targets.fs

@@ -66,13 +66,13 @@ module Main =
         target "inherit-doc" <| InheritDoc.PatchInheritDocs
 
         target "test-nuget-package" <| fun _ -> 
-            //run release unit tests puts packages in the system cache prevent this from happening locally
+            // run release unit tests puts packages in the system cache prevent this from happening locally
             if not Commandline.runningOnCi then ignore ()
             else Tests.RunReleaseUnitTests artifactsVersion |> ignore
 
         target "nuget-pack" <| fun _ -> Release.NugetPack artifactsVersion
 
-        conditional (parsed.Target = "canary") "nuget-pack-versioned" <| fun _ -> Release.NugetPackVersioned artifactsVersion
+        conditional (parsed.Target = "canary" && not isMono) "nuget-pack-versioned" <| fun _ -> Release.NugetPackVersioned artifactsVersion
 
         conditional (parsed.Target <> "canary") "generate-release-notes" <| fun _ -> ReleaseNotes.GenerateNotes buildVersions 
 

src/Auxiliary/Elasticsearch.Net.Virtual/Elasticsearch.Net.Virtual.csproj

@@ -4,11 +4,7 @@
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     </PropertyGroup>
-    <ItemGroup Condition="'$(TestPackageVersion)'!=''">
-        <PackageReference Include="Elasticsearch.Net" Version="$(TestPackageVersion)" />
-    </ItemGroup>
-    <ItemGroup Condition="'$(TestPackageVersion)'==''">
+    <ItemGroup>
         <ProjectReference Include="..\..\Elasticsearch.Net\Elasticsearch.Net.csproj" />
     </ItemGroup>
-
 </Project>

src/Auxiliary/Nest.JsonNetSerializer/Nest.JsonNetSerializer.csproj

@@ -7,7 +7,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Nest\Nest.csproj" />
     <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="4.0.0" />
-    <PackageReference Condition="'$(OS)' != 'Windows_NT'" Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0-preview.2" /> 
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />

src/Elasticsearch.Net/Elasticsearch.Net.csproj

@@ -10,7 +10,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="4.0.0" />
-    <PackageReference Condition="'$(OS)' != 'Windows_NT'" Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0-preview.2" /> 
     <PackageReference Include="Microsoft.CSharp" Version="4.6.0-preview3.19128.7" />
 
   </ItemGroup>

src/Library.build.props

@@ -29,4 +29,8 @@
 
 		<LangVersion>latest</LangVersion>
 	</PropertyGroup>
+	<ItemGroup>
+        <PackageReference Condition="'$(OS)' != 'Windows_NT' and '$(TargetFramework)'=='net461'" Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0-preview.2" />
+        <PackageReference Condition="'$(OS)' != 'Windows_NT' and '$(TargetFramework)'=='net472'" Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0-preview.2" />
+    </ItemGroup>
 </Project>

src/Nest/Nest.csproj

@@ -8,7 +8,6 @@
   <ItemGroup>
     <ProjectReference Include="..\Elasticsearch.Net\Elasticsearch.Net.csproj" />
     <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="4.0.0" />
-    <PackageReference Condition="'$(OS)' != 'Windows_NT'" Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0-preview.2" /> 
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Requests.*.cs">

src/Tests/Tests.Benchmarking/Tests.Benchmarking.csproj

@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))\src\Artifacts.build.props" />
   <PropertyGroup>
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">netcoreapp2.1;net461</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2;net472</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

src/Tests/Tests/Tests.csproj

@@ -2,16 +2,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))\src\Artifacts.build.props" />
   <PropertyGroup>
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">netcoreapp2.1;net461</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
     <NoWarn>$(NoWarn);xUnit1013</NoWarn>
     <DebugSymbols>True</DebugSymbols>
     <LangVersion>latest</LangVersion>
     <IsTestProject>True</IsTestProject>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Tests.Core\Tests.Core.csproj" />
-    <ProjectReference Include="..\..\Auxiliary\Elasticsearch.Net.Virtual\Elasticsearch.Net.Virtual.csproj" />
 
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
@@ -28,6 +26,12 @@
     <PackageReference Include="xunit.extensibility.execution" Version="2.3.1" />
     <PackageReference Include="Ben.Demystifier" Version="0.1.4" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TestPackageVersion)'!=''">
+    <PackageReference Include="Elasticsearch.Net.Virtual" Version="$(TestPackageVersion)" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TestPackageVersion)'==''">
+    <ProjectReference Include="..\..\Auxiliary\Elasticsearch.Net.Virtual\Elasticsearch.Net.Virtual.csproj" />
+  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Document\Single\Index\Attachment_Test_Document.pdf" />
   </ItemGroup>