fix residual rebase artifacts

Author: TheAngryByrd

src/FsToolkit.ErrorHandling/OptionCE.fs

@@ -118,12 +118,6 @@ module OptionCE =
         /// </summary>
         member inline _.Source(result: 'value option) : 'value option = result
 
-
-        /// <summary>
-        /// Method lets us transform data types into our internal representation.
-        /// </summary>
-        member inline _.Source(vopt: 'value voption) : 'value option = Option.ofValueOption vopt
-
     /// <summary>
     /// The default instance of the `OptionBuilder` type.
     /// </summary>

tests/FsToolkit.ErrorHandling.AsyncSeq.Tests/FsToolkit.ErrorHandling.AsyncSeq.Tests.fsproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0</TargetFrameworks>
         <LangVersion>preview</LangVersion>
     </PropertyGroup>
     <ItemGroup>

tests/FsToolkit.ErrorHandling.IcedTasks.Tests/FsToolkit.ErrorHandling.IcedTasks.Tests.fsproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0</TargetFrameworks>
         <LangVersion>preview</LangVersion>
     </PropertyGroup>
     <ItemGroup>

tests/FsToolkit.ErrorHandling.JobResult.Tests/FsToolkit.ErrorHandling.JobResult.Tests.fsproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0</TargetFrameworks>
         <LangVersion>preview</LangVersion>
     </PropertyGroup>
 

tests/FsToolkit.ErrorHandling.TaskResult.Tests/FsToolkit.ErrorHandling.TaskResult.Tests.fsproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0</TargetFrameworks>
         <LangVersion>preview</LangVersion>
     </PropertyGroup>
     <ItemGroup>

tests/FsToolkit.ErrorHandling.Tests/AsyncOptionCE.fs

@@ -260,7 +260,7 @@ let ``AsyncOptionCE using Tests`` =
             let! actual =
                 asyncOption {
                     use d =
-                        makeDisposable (fun () ->
+                        TestHelpers.makeDisposable (fun () ->
                             disposed <- true
 
                             if not finished then

tests/FsToolkit.ErrorHandling.Tests/AsyncResultCE.fs

@@ -343,7 +343,7 @@ let ``AsyncResultCE using Tests`` =
             let! actual =
                 asyncResult {
                     use d =
-                        makeDisposable (fun () ->
+                        TestHelpers.makeDisposable (fun () ->
                             disposed <- true
 
                             if not finished then

tests/FsToolkit.ErrorHandling.Tests/FsToolkit.ErrorHandling.Tests.fsproj

@@ -2,14 +2,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0</TargetFrameworks>
         <LangVersion>preview</LangVersion>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="../../src/FsToolkit.ErrorHandling/FsToolkit.ErrorHandling.fsproj">
         </ProjectReference>
     </ItemGroup>
     <ItemGroup>
+        <Compile Include="TestHelpers.fs" />
         <Compile Include="SampleDomain.fs" />
         <Compile Include="TestData.fs" />
         <Compile Include="Expect.fs" />
@@ -39,43 +40,4 @@
         <Watch Include="@(None)" />
     </ItemGroup>
     <Import Project="..\..\.paket\Paket.Restore.targets" />
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
-    <LangVersion>preview</LangVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../src/FsToolkit.ErrorHandling/FsToolkit.ErrorHandling.fsproj">
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="TestHelpers.fs" />
-    <Compile Include="SampleDomain.fs" />
-    <Compile Include="TestData.fs" />
-    <Compile Include="Expect.fs" />
-    <Compile Include="Result.fs" />
-    <Compile Include="ResultCE.fs" />
-    <Compile Include="ResultOption.fs" />
-    <Compile Include="ResultOptionCE.fs" />
-    <Compile Include="Option.fs" />
-    <Compile Include="OptionCE.fs" />
-    <Compile Include="ValueOption.fs" />
-    <Compile Include="ValueOptionCE.fs" />
-    <Compile Include="AsyncOption.fs" />
-    <Compile Include="AsyncOptionCE.fs" />
-    <Compile Include="List.fs" />
-    <Compile Include="Seq.fs" />
-    <Compile Include="AsyncResult.fs" />
-    <Compile Include="AsyncResultCE.fs" />
-    <Compile Include="AsyncResultOption.fs" />
-    <Compile Include="AsyncResultOptionCE.fs" />
-    <Compile Include="Validation.fs" />
-    <Compile Include="ValidationCE.fs" />
-    <Compile Include="AsyncValidation.fs" />
-    <Compile Include="AsyncValidationCE.fs" />
-    <Compile Include="Main.fs" />
-    <None Include="paket.references" />
-    <Watch Include="@(None)" />
-  </ItemGroup>
-  <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>