Target FSharp.Core 6.0.0 as min supported version

Unquote.sln

@@ -21,6 +21,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "nunit3", "verify\nunit3\nun
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "xunit2", "verify\xunit2\xunit2.fsproj", "{AAA79FB0-D2EF-461D-A0FC-0C8D22ACC0DF}"
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "UnquoteTests.FSCore6", "test\UnquoteTests.FSCore6\UnquoteTests.FSCore6.fsproj", "{15C906E2-EB95-43BC-8039-9132F8F8582D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -106,6 +108,18 @@ Global
 		{AAA79FB0-D2EF-461D-A0FC-0C8D22ACC0DF}.Release|x64.Build.0 = Release|Any CPU
 		{AAA79FB0-D2EF-461D-A0FC-0C8D22ACC0DF}.Release|x86.ActiveCfg = Release|Any CPU
 		{AAA79FB0-D2EF-461D-A0FC-0C8D22ACC0DF}.Release|x86.Build.0 = Release|Any CPU
+		{15C906E2-EB95-43BC-8039-9132F8F8582D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15C906E2-EB95-43BC-8039-9132F8F8582D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15C906E2-EB95-43BC-8039-9132F8F8582D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{15C906E2-EB95-43BC-8039-9132F8F8582D}.Debug|x64.Build.0 = Debug|Any CPU
+		{15C906E2-EB95-43BC-8039-9132F8F8582D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{15C906E2-EB95-43BC-8039-9132F8F8582D}.Debug|x86.Build.0 = Debug|Any CPU
+		{15C906E2-EB95-43BC-8039-9132F8F8582D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15C906E2-EB95-43BC-8039-9132F8F8582D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15C906E2-EB95-43BC-8039-9132F8F8582D}.Release|x64.ActiveCfg = Release|Any CPU
+		{15C906E2-EB95-43BC-8039-9132F8F8582D}.Release|x64.Build.0 = Release|Any CPU
+		{15C906E2-EB95-43BC-8039-9132F8F8582D}.Release|x86.ActiveCfg = Release|Any CPU
+		{15C906E2-EB95-43BC-8039-9132F8F8582D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{6A3A80CD-42FE-42B8-94F9-38F89C64B6DF} = {BD953E61-B0CC-405E-AF92-FF6504E3A720}
@@ -114,5 +128,6 @@ Global
 		{CF712BBA-9EEE-42F8-B916-6845908CBB73} = {1F4E9767-C9F1-4235-AD37-2AC9452A6F36}
 		{C80103CA-08DC-4AE1-A76E-E6957C8B4ACC} = {1F4E9767-C9F1-4235-AD37-2AC9452A6F36}
 		{AAA79FB0-D2EF-461D-A0FC-0C8D22ACC0DF} = {1F4E9767-C9F1-4235-AD37-2AC9452A6F36}
+		{15C906E2-EB95-43BC-8039-9132F8F8582D} = {336CD055-01F3-4B85-910A-79D9873C05F3}
 	EndGlobalSection
 EndGlobal

src/Unquote/Unquote.fsproj

@@ -5,7 +5,7 @@
     <NuSpecFile>Unquote.nuspec</NuSpecFile>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
-    <Version>7.0.0</Version>
+    <Version>7.0.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -32,7 +32,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="8.0.100" />
+    <!-- Relatively conservative dependency to avoid cascading dependencies downstream -->
+    <PackageReference Update="FSharp.Core" Version="6.0.0" />
   </ItemGroup>
 
 </Project>

src/Unquote/Unquote.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Unquote</id>
-    <version>7.0.0</version>
+    <version>7.0.1</version>
     <authors>Stephen Swensen</authors>
     <owners>Stephen Swensen</owners>
     <icon>images/logo.png</icon>
@@ -19,7 +19,7 @@ Unquote integrates configuration-free with all exception-based unit testing fram
 In addition to its unit testing features, Unquote includes operators for evaluating, decompiling, and incrementally reducing quoted expressions.</description>
     <dependencies>
       <group targetFramework="netstandard2.0">
-        <dependency id="FSharp.Core" version="8.0.100"></dependency>
+        <dependency id="FSharp.Core" version="6.0.0"></dependency>
       </group>
     </dependencies>
     <releaseNotes>https://github.com/SwensenSoftware/unquote/wiki/ReleaseNotes</releaseNotes>

src/Unquote/packages.lock.json

@@ -4,9 +4,9 @@
     ".NETStandard,Version=v2.0": {
       "FSharp.Core": {
         "type": "Direct",
-        "requested": "[8.0.100, )",
-        "resolved": "8.0.100",
-        "contentHash": "ZOVZ/o+jI3ormTZOa28Wh0tSRoyle1f7lKFcUN61sPiXI7eDZu8eSveFybgTeyIEyW0ujjp31cp7GOglDgsNEg=="
+        "requested": "[6.0.0, )",
+        "resolved": "6.0.0",
+        "contentHash": "fbv1UwJ2LXVcFCt+GGDPu0sIYA5C6gdDvAupDj3iLQF3clRkua/6J33f+FiGQa8P1tEa+zmz3wrjoTnXZ1UiYg=="
       },
       "NETStandard.Library": {
         "type": "Direct",

test/UnquoteTests.FSCore6/UnquoteTests.FSCore6.fsproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <IsPackable>false</IsPackable>
+        <GenerateProgramFile>false</GenerateProgramFile>
+        <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+        <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
+        <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
+        <RootNamespace>UnquoteTests.FSCore6</RootNamespace>
+    </PropertyGroup>
+    <ItemGroup>
+        <Compile Include="../UnquoteTests/*.fs" />
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+        <PackageReference Include="xunit" Version="2.8.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <ProjectReference Include="../../src/Unquote/Unquote.fsproj" />
+        <PackageReference Update="FSharp.Core" Version="6.0.0" />
+    </ItemGroup>
+</Project>

test/UnquoteTests.FSCore6/packages.lock.json

@@ -0,0 +1,118 @@
+{
+  "version": 1,
+  "dependencies": {
+    "net8.0": {
+      "FSharp.Core": {
+        "type": "Direct",
+        "requested": "[6.0.0, )",
+        "resolved": "6.0.0",
+        "contentHash": "fbv1UwJ2LXVcFCt+GGDPu0sIYA5C6gdDvAupDj3iLQF3clRkua/6J33f+FiGQa8P1tEa+zmz3wrjoTnXZ1UiYg=="
+      },
+      "Microsoft.NET.Test.Sdk": {
+        "type": "Direct",
+        "requested": "[17.9.0, )",
+        "resolved": "17.9.0",
+        "contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==",
+        "dependencies": {
+          "Microsoft.CodeCoverage": "17.9.0",
+          "Microsoft.TestPlatform.TestHost": "17.9.0"
+        }
+      },
+      "xunit": {
+        "type": "Direct",
+        "requested": "[2.8.0, )",
+        "resolved": "2.8.0",
+        "contentHash": "US3a3twJziAif1kFPGdk9fALwILHxV0n1roX5j67bN/d3o4DGNLHnV3tr5ZX+uinVrzfkf0avH3zGX8JPBC0qA==",
+        "dependencies": {
+          "xunit.analyzers": "1.13.0",
+          "xunit.assert": "2.8.0",
+          "xunit.core": "[2.8.0]"
+        }
+      },
+      "xunit.runner.visualstudio": {
+        "type": "Direct",
+        "requested": "[2.8.0, )",
+        "resolved": "2.8.0",
+        "contentHash": "mqQbS2zr8dfgSWxkNOC6UTzO8JoqpTmM5+FFn2XR/2nVmx2JvEY0YbM5pt2FmXVg9YVe+jKUPHd6KrroyCl67w=="
+      },
+      "Microsoft.CodeCoverage": {
+        "type": "Transitive",
+        "resolved": "17.9.0",
+        "contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA=="
+      },
+      "Microsoft.TestPlatform.ObjectModel": {
+        "type": "Transitive",
+        "resolved": "17.9.0",
+        "contentHash": "1ilw/8vgmjLyKU+2SKXKXaOqpYFJCQfGqGz+x0cosl981VzjrY74Sv6qAJv+neZMZ9ZMxF3ArN6kotaQ4uvEBw==",
+        "dependencies": {
+          "System.Reflection.Metadata": "1.6.0"
+        }
+      },
+      "Microsoft.TestPlatform.TestHost": {
+        "type": "Transitive",
+        "resolved": "17.9.0",
+        "contentHash": "Spmg7Wx49Ya3SxBjyeAR+nQpjMTKZwTwpZ7KyeOTIqI/WHNPnBU4HUvl5kuHPQAwGWqMy4FGZja1HvEwvoaDiA==",
+        "dependencies": {
+          "Microsoft.TestPlatform.ObjectModel": "17.9.0",
+          "Newtonsoft.Json": "13.0.1"
+        }
+      },
+      "Newtonsoft.Json": {
+        "type": "Transitive",
+        "resolved": "13.0.1",
+        "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
+      },
+      "System.Reflection.Metadata": {
+        "type": "Transitive",
+        "resolved": "1.6.0",
+        "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ=="
+      },
+      "xunit.abstractions": {
+        "type": "Transitive",
+        "resolved": "2.0.3",
+        "contentHash": "pot1I4YOxlWjIb5jmwvvQNbTrZ3lJQ+jUGkGjWE3hEFM0l5gOnBWS+H3qsex68s5cO52g+44vpGzhAt+42vwKg=="
+      },
+      "xunit.analyzers": {
+        "type": "Transitive",
+        "resolved": "1.13.0",
+        "contentHash": "Pai9YnDV71/Ox14nBHB6/f62iyPyLbmUG/YYMiA4dfdFZvr0gIYE9yGxSr0i5Tr3INK75wgL2MCUNEKpeiZ2Fw=="
+      },
+      "xunit.assert": {
+        "type": "Transitive",
+        "resolved": "2.8.0",
+        "contentHash": "lwf7Dy5/5HbDkaPx1YrGXCByytCEEcIn+KPI74jh2BD/RU/7RhO8c+S3k0Ph+Mr7+cLf338fl+o6UcgPCLa6PA=="
+      },
+      "xunit.core": {
+        "type": "Transitive",
+        "resolved": "2.8.0",
+        "contentHash": "McSTFGTETCxLpmJKE9TWi9FtFthrRbpRrjz2V2g8sK2wRt1+JHs15vwi+B+nfftFkV9aFWIXZfzZM95TIGZNIA==",
+        "dependencies": {
+          "xunit.extensibility.core": "[2.8.0]",
+          "xunit.extensibility.execution": "[2.8.0]"
+        }
+      },
+      "xunit.extensibility.core": {
+        "type": "Transitive",
+        "resolved": "2.8.0",
+        "contentHash": "eBJv9xQeY0p5z+C/L1tFjUFYqtl5pQqIEYCGTMl+MbRzA7sOlgYKwJE//vEePBp+mgBh7NjD0Qhz0liZBYM27w==",
+        "dependencies": {
+          "xunit.abstractions": "2.0.3"
+        }
+      },
+      "xunit.extensibility.execution": {
+        "type": "Transitive",
+        "resolved": "2.8.0",
+        "contentHash": "TyyrZesHB9ODZMS9c73OqiBz4x0vL944JCkSPBWW5w6PF2LlUfdfXRjjOhoIOuY6lTmEgl07rS4/Jot9mCYnpg==",
+        "dependencies": {
+          "xunit.extensibility.core": "[2.8.0]"
+        }
+      },
+      "unquote": {
+        "type": "Project",
+        "dependencies": {
+          "FSharp.Core": "[6.0.0, )"
+        }
+      }
+    }
+  }
+}

test/UnquoteTests/DecompilationTests.fs

@@ -391,9 +391,9 @@ let ``generic NewUnionCase with nested construction`` () =
 let ``union case test list not requiring op_Dynamic`` () = //this test is a little fragile (see sf use; using regex would be too much), but not too fragile
     let sf = System.Diagnostics.StackFrame(true)
     #if DEBUG
-    decompile <@ let [a;b] = [1;2] in a,b @> =! String.Format(@"let patternInput = [1; 2] in if (match patternInput with | _::_ -> true | _ -> false) then (if (match patternInput.Tail with | _::_ -> true | _ -> false) then (if (match patternInput.Tail.Tail with | [] -> true | _ -> false) then (let a = patternInput.Head in let b = patternInput.Tail.Head in (a, b)) else raise (new MatchFailureException(""{0}"", {1}, {2}))) else raise (new MatchFailureException(""{0}"", {1}, {2}))) else raise (new MatchFailureException(""{0}"", {1}, {2}))", sf.GetFileName(), sf.GetFileLineNumber() + 2, 21).Replace("\\", "\\\\")
+    (decompile <@ let [a;b] = [1;2] in a,b @>).Replace("UnquoteTests.FSCore6/../", "") =! String.Format(@"let patternInput = [1; 2] in if (match patternInput with | _::_ -> true | _ -> false) then (if (match patternInput.Tail with | _::_ -> true | _ -> false) then (if (match patternInput.Tail.Tail with | [] -> true | _ -> false) then (let a = patternInput.Head in let b = patternInput.Tail.Head in (a, b)) else raise (new MatchFailureException(""{0}"", {1}, {2}))) else raise (new MatchFailureException(""{0}"", {1}, {2}))) else raise (new MatchFailureException(""{0}"", {1}, {2}))", sf.GetFileName(), sf.GetFileLineNumber() + 2, 22).Replace("\\", "\\\\")
     #else
-    decompile <@ let [a;b] = [1;2] in a,b @> =! String.Format(@"let patternInput = [1; 2] in if (match patternInput with | _::_ -> true | _ -> false) then (if (match patternInput.Tail with | _::_ -> true | _ -> false) then (if (match patternInput.Tail.Tail with | [] -> true | _ -> false) then (let a = patternInput.Head in let b = patternInput.Tail.Head in (a, b)) else raise (new MatchFailureException(""{0}"", {1}, {2}))) else raise (new MatchFailureException(""{0}"", {1}, {2}))) else raise (new MatchFailureException(""{0}"", {1}, {2}))", sf.GetFileName(), sf.GetFileLineNumber() + 4, 21).Replace("\\", "\\\\")
+    (decompile <@ let [a;b] = [1;2] in a,b @>).Replace("UnquoteTests.FSCore6/../", "") =! String.Format(@"let patternInput = [1; 2] in if (match patternInput with | _::_ -> true | _ -> false) then (if (match patternInput.Tail with | _::_ -> true | _ -> false) then (if (match patternInput.Tail.Tail with | [] -> true | _ -> false) then (let a = patternInput.Head in let b = patternInput.Tail.Head in (a, b)) else raise (new MatchFailureException(""{0}"", {1}, {2}))) else raise (new MatchFailureException(""{0}"", {1}, {2}))) else raise (new MatchFailureException(""{0}"", {1}, {2}))", sf.GetFileName(), sf.GetFileLineNumber() + 4, 22).Replace("\\", "\\\\")
     #endif
 
 let h = World (Hello2(Hello 3, true))

test/UnquoteTests/UnquoteTests.fsproj

@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
@@ -8,36 +7,25 @@
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
     <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
   </PropertyGroup>
-
   <ItemGroup>
-    <Compile Include="EvaluationTests.fs" />
-    <Compile Include="DynamicOperatorsEvaluationTests.fs" />
+    <Compile Include="AssertionOperatorsTests.fs" />
     <Compile Include="CheckedDynamicOperatorsEvaluationTests.fs" />
-    <Compile Include="FSharpNameTests.fs" />
+    <Compile Include="CustomExceptionSerializationTests.fs" />
     <Compile Include="DecompilationTests.fs" />
+    <Compile Include="DynamicOperatorsEvaluationTests.fs" />
+    <Compile Include="EvaluationTests.fs" />
+    <Compile Include="FSharpNameTests.fs" />
     <Compile Include="ReductionTests.fs" />
-    <Compile Include="AssertionOperatorsTests.fs" />
-    <Compile Include="CustomExceptionSerializationTests.fs" />
     <Compile Include="UnquotedExpressionTests.fs" />
-    <Compile Include="Program.fs" />
   </ItemGroup>
-
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.4" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.8.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
       <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
     <ProjectReference Include="../../src/Unquote/Unquote.fsproj" />
-    <PackageReference Update="FSharp.Core" Version="8.0.100" />
+    <PackageReference Update="FSharp.Core" Version="8.0.403" />
   </ItemGroup>
-
 </Project>