fix bad rebase

ionide · Dec 8, 2024 · acc81c5 · acc81c5
1 parent 8854d35
commit acc81c5
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 68 deletions.
diff --git a/benchmarks/benchmarks.fsproj b/benchmarks/benchmarks.fsproj
@@ -4,11 +4,6 @@
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net8.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(BuildNet9)' == 'true'">net8.0;net9.0</TargetFrameworks>
-    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
-
-
-    <TargetFrameworks>net8.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(BuildNet9)' == 'true'">$(TargetFrameworks);net9.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="SourceTextBenchmarks.fs" />

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100",
+    "version": "8.0.300",
     "rollForward": "latestMinor"
   }
 }
diff --git a/src/FsAutoComplete.Core/AdaptiveExtensions.fs b/src/FsAutoComplete.Core/AdaptiveExtensions.fs
@@ -119,62 +119,6 @@ type MapDisposableTupleVal<'T1, 'T2, 'Disposable when 'Disposable :> IDisposable
 
 module AVal =
 
-  // [<Sealed>]
-  // type MapByVal<'T1, 'T2>(equals, mapping: 'T1 -> 'T2, input: aval<'T1>) =
-  //     inherit AbstractVal<'T2>()
-
-  //     // can we avoid double caching (here and in AbstractVal)
-  //     let mutable cache: ValueOption<struct ('T1 * 'T2)> = ValueNone
-
-  //     override x.Compute(token: AdaptiveToken) =
-  //         let i = input.GetValue token
-  //         match cache with
-  //         | ValueSome (struct (a, b)) when equals a i ->
-  //             b
-  //         | _ ->
-  //             let b = mapping i
-  //             cache <- ValueSome(struct (i, b))
-  //             b
-
-
-  // /// Aval for binding a single value
-  // [<Sealed>]
-  // type BindByVal<'T1, 'T2>(equals, mapping: 'T1 -> aval<'T2>, input: aval<'T1>) =
-  //     inherit AbstractVal<'T2>()
-
-  //     let mutable inner: ValueOption< struct ('T1 * aval<'T2>) > = ValueNone
-  //     let mutable inputDirty = 1
-
-  //     override x.InputChangedObject(_, o) =
-  //         if Object.ReferenceEquals(o, input) then
-  //             inputDirty <- 1
-
-  //     override x.Compute(token: AdaptiveToken) =
-  //         let va = input.GetValue token
-  //         #if FABLE_COMPILER
-  //         let inputDirty = let v = inputDirty in inputDirty <- 0; v <> 0
-  //         #else
-  //         let inputDirty = System.Threading.Interlocked.Exchange(&inputDirty, 0) <> 0
-  //         #endif
-  //         match inner with
-  //         | ValueNone ->
-  //             let result = mapping va
-  //             inner <- ValueSome (struct (va, result))
-  //             result.GetValue token
-
-  //         | ValueSome(struct (oa, oldResult)) when not inputDirty || equals oa va ->
-  //             oldResult.GetValue token
-
-  //         | ValueSome(struct (_, old)) ->
-  //             old.Outputs.Remove x |> ignore
-  //             let result = mapping va
-  //             inner <- ValueSome (struct (va, result))
-  //             result.GetValue token
-
-  // let mapBy equals mapping input = MapByVal(equals, mapping, input) :> aval<_>
-
-  // let bindBy equals mapping input = BindByVal(equals, mapping, input) :> aval<_>
-
   let mapOption f = AVal.map (Option.map f)
 
   /// <summary>

diff --git a/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj b/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj
@@ -2,8 +2,6 @@
   <PropertyGroup>
     <TargetFrameworks>net8.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(BuildNet9)' == 'true'">net8.0;net9.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(BuildNet9)' == 'true'">net9.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(BuildNet9)' == 'true'">$(TargetFrameworks);net9.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <NoWarn>$(NoWarn);FS0057</NoWarn> <!-- Allows using experimental FCS APIs -->
   </PropertyGroup>

diff --git a/src/FsAutoComplete/FsAutoComplete.fsproj b/src/FsAutoComplete/FsAutoComplete.fsproj
@@ -4,8 +4,6 @@
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net8.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(BuildNet9)' == 'true'">net8.0;net9.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(BuildNet9)' == 'true'">net9.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(BuildNet9)' == 'true'">$(TargetFrameworks);net9.0</TargetFrameworks>
     <AssemblyName>fsautocomplete</AssemblyName>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
@@ -50,8 +48,6 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-
-    <ProjectReference Include="C:\Users\jimmy\Repositories\public\TheAngryByrd\fsharp\src\Compiler\FSharp.Compiler.Service.fsproj" />
     <ProjectReference Include="..\FsAutoComplete.Core\FsAutoComplete.Core.fsproj" />
   </ItemGroup>
   <PropertyGroup Condition=" '$(PackAsTool)' == 'true' ">