Merge branch 'master' into release/v1

# Conflicts:
#	ReleaseNotes.md

Author: SteveGilham

Build/targets.fsx

@@ -239,16 +239,13 @@ _Target "PrepareDotNetBuild" (fun _ ->
                         System.IO.Compression.ZipFile.ExtractToDirectory(f, unpack))
 
   [ ("./_Publish/expecto/altcode.test.expecto.nuspec",
-     "AltCode.Test.Expecto (Expecto helper)",
-     false)
+     "AltCode.Test.Expecto (Expecto helper)")
     ("./_Publish/nunit/altcode.test.nunit.nuspec",
-     "AltCode.Test.NUnit (NUnit helper)",
-     true)
+     "AltCode.Test.NUnit (NUnit helper)")
     ("./_Publish/xunit/altcode.test.xunit.nuspec",
-     "AltCode.Test.Xunit (Xunit helper)",
-     true)
+     "AltCode.Test.Xunit (Xunit helper)")
       ]
-  |> List.iter (fun (path, caption, staticlink) ->
+  |> List.iter (fun (path, caption) ->
        let x s = XName.Get(s, "http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd")
        let dotnetNupkg = XDocument.Load path
        let desc = dotnetNupkg.Descendants(x "description") |> Seq.head
@@ -273,10 +270,7 @@ _Target "PrepareDotNetBuild" (fun _ ->
 
        dotnetNupkg.Descendants(x "dependency")
        |> Seq.filter (fun node -> let id = node.Attribute(XName.Get "id").Value
-                                  id = "altcode.test.common" ||
-                                  (staticlink && 
-                                   id = "FSharp.Core" && 
-                                   node.Parent.Attribute(XName.Get "targetFramework").Value.StartsWith(".NETFramework", StringComparison.Ordinal)))
+                                  id = "altcode.test.common")
        |> Seq.toList
        |> List.iter (fun n -> n.Remove())
 

ReleaseNotes.md

@@ -2,6 +2,10 @@ Q. Never mind the fluff -- how do I get started?
 
 A. Start with the README : https://github.com/SteveGilham/altcode.test/blob/master/README.md
 
+# 1.0.8
+* `altcode.test.nunit` -- Fix classic framework support support
+* `altcode.test.xunit` -- Fix classic framework support support
+
 # 1.0.6
 * [BREAKING] `Match` -> `AssertionMatch`
 * `altcode.test.expecto` -- add `Expecto.Flip` support

altcode.test/altcode.test.nunit/altcode.test.nunit.fsproj

@@ -10,7 +10,6 @@
     <OutputPath>$(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/</OutputPath>
     <IntermediateOutputPath>$(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/</IntermediateOutputPath>
     <OtherFlags>--keyfile:$(SolutionDir)..\Build\Infrastructure.snk --staticlink:altcode.test.common</OtherFlags>
-    <OtherFlags Condition="'$(TargetFramework)' != 'netstandard2.0'">$(OtherFlags) --standalone</OtherFlags>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageProjectUrl>https://github.com/SteveGilham/altcode.test</PackageProjectUrl>
     <RepositoryUrl>https://github.com/SteveGilham/altcode.test</RepositoryUrl>

altcode.test/altcode.test.xunit/altcode.test.xunit.fsproj

@@ -10,7 +10,6 @@
     <OutputPath>$(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/</OutputPath>
     <IntermediateOutputPath>$(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/</IntermediateOutputPath>
     <OtherFlags>--keyfile:$(SolutionDir)..\Build\Infrastructure.snk --staticlink:altcode.test.common</OtherFlags>
-    <OtherFlags Condition="'$(TargetFramework)' != 'netstandard2.0'">$(OtherFlags) --standalone</OtherFlags>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageProjectUrl>https://github.com/SteveGilham/altcode.test</PackageProjectUrl>
     <RepositoryUrl>https://github.com/SteveGilham/altcode.test</RepositoryUrl>