Bump .Net to 8.0

Add apiRaw method
Dolfik1 · Jan 31, 2024 · 9af4f31 · 9af4f31
1 parent bb9afb3
commit 9af4f31
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 18 deletions.
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Install dependencies
       run: dotnet restore
     - name: Build

diff --git a/src/Funogram.Generator/Funogram.Generator.fsproj b/src/Funogram.Generator/Funogram.Generator.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/Funogram.Telegram/Directory.Build.props b/src/Funogram.Telegram/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <Version>6.9.0.0</Version>
+        <Version>6.9.0.1</Version>
         <Authors>Nikolay Matyushin</Authors>
         <Product>Funogram.Telegram</Product>
         <Title>Funogram.Telegram</Title>

diff --git a/src/Funogram.Tests/Funogram.Tests.fsproj b/src/Funogram.Tests/Funogram.Tests.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/Funogram.Tests/Json.fs b/src/Funogram.Tests/Json.fs
@@ -13,6 +13,14 @@ let ``JSON deserializing MessageEntity`` () =
   | Ok r -> shouldEqual r Constants.jsonTestObj
   | Error e -> failwith e.Description
 
+[<Fact>]
+let ``JSON deserializing MessageEntity as Object`` () =
+  let a = parseJson(Constants.jsonTestObjResultString)
+
+  match a with
+  | Ok r -> shouldEqual true (r <> null)
+  | Error e -> failwith e.Description
+
 [<Fact>]
 let ``JSON serializing MessageEntity``() =
   Constants.jsonTestObj
@@ -68,7 +76,6 @@ let ``JSON deserializing MaskPosition`` () =
   |> function
   | Ok result -> shouldEqual result Constants.testMaskPosition
   | Error error -> failwith error.Description
-
 
 [<Fact>]
 let ``JSON serializing MaskPosition`` () =
@@ -89,7 +96,7 @@ let ``JSON deserializing ForwardMessage`` () =
   |> function
   | Ok result -> shouldEqual result Constants.jsonMessageForward
   | Error error -> failwith error.Description
-    
+
 [<Fact>]
 let ``JSON serializing params dictionary`` () =
   Constants.paramsDictionary
@@ -101,7 +108,7 @@ let ``JSON serializing forward message request`` () =
   Constants.forwardMessageReq
   |> toJsonBotRequestString
   |> shouldEqual Constants.jsonForwardMessageReq
-  
+
 [<Fact>]
 let ``JSON deserializing ChatMember``() =
   Constants.jsonTestObjChatMemberResultString

diff --git a/src/Funogram/Api.fs b/src/Funogram/Api.fs
@@ -4,4 +4,7 @@ module Funogram.Api
   open Funogram.Tools
 
   let api config (request: IRequestBase<'a>) = 
-    Api.makeRequestAsync config request
+    Api.makeRequestAsync<'a> config request
+
+  let apiRaw config (request: IBotRequest) = 
+    Api.makeRequestAsync<obj> config request
diff --git a/src/Funogram/Funogram.fsproj b/src/Funogram/Funogram.fsproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
-    <VersionPrefix>2.0.8</VersionPrefix>
+    <VersionPrefix>2.0.9</VersionPrefix>
     <Authors>Nikolay Matyushin</Authors>
     <Product>Funogram</Product>
     <Description>Funogram is a functional Telegram Bot Api library for F#</Description>

diff --git a/src/Funogram/Tools.fs b/src/Funogram/Tools.fs
@@ -4,6 +4,7 @@ open System
 open System.Net
 open System.Net.Http
 open System.Runtime.CompilerServices
+open Funogram.Types
 open Utf8Json
 open Utf8Json.Resolvers
 
@@ -74,7 +75,7 @@ let internal parseJsonStream<'a> (data: Stream) =
       Exception("Can't parse json") |> Result.Error
 
 let internal parseJsonStreamApiResponse<'a> (data: Stream) =
-  match parseJsonStream<Types.ApiResponse<'a>> data with
+  match parseJsonStream<ApiResponse<'a>> data with
   | Ok x when x.Ok && x.Result.IsSome -> Ok x.Result.Value
 
   | Ok x when x.Description.IsSome && x.ErrorCode.IsSome -> 
@@ -376,7 +377,7 @@ module Api =
     let fn = mkRequestGenerator<'a> ()
     fun (request: IBotRequest) -> fn (request :?> 'a) ""
 
-  let makeRequestAsync config (request: IRequestBase<'a>) =
+  let makeRequestAsync<'a> config (request: IBotRequest) =
     async {
       let client = config.Client
       let url = getUrl config request.MethodName
@@ -400,7 +401,6 @@ module Api =
       else
         return Error { Description = "HTTP_ERROR"; ErrorCode = int result.StatusCode }
     }
-
 
   let makeJsonBodyRequestAsync config (request: IRequestBase<'a>) =
     async {

diff --git a/src/examples/Funogram.Examples.AnonChat/Funogram.Examples.AnonChat.fsproj b/src/examples/Funogram.Examples.AnonChat/Funogram.Examples.AnonChat.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/examples/Funogram.Examples.Banhammer/Funogram.Examples.Banhammer.fsproj b/src/examples/Funogram.Examples.Banhammer/Funogram.Examples.Banhammer.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/examples/Funogram.Examples.HelloWorld/Funogram.Examples.HelloWorld.fsproj b/src/examples/Funogram.Examples.HelloWorld/Funogram.Examples.HelloWorld.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/examples/Funogram.Examples.WebSocket/Funogram.Examples.WebSocket.fsproj b/src/examples/Funogram.Examples.WebSocket/Funogram.Examples.WebSocket.fsproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/examples/Funogram.TestBot/Funogram.TestBot.fsproj b/src/examples/Funogram.TestBot/Funogram.TestBot.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Core.fs" />