Merge pull request fable-compiler#3542 from ncave/rust

ncave · web-flow · commit 6ebb95982119 · 2023-10-14T22:38:03.000Z
Enable builds with .NET 6.0/7.0/8.0
diff --git a/build/Build.fsproj b/build/Build.fsproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
+    <RollForward>Major</RollForward>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Utils.fs" />
@@ -38,12 +39,12 @@
     <Compile Include="Main.fs" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Update="FSharp.Core" Version="7.0.400" />
     <PackageReference Include="BlackFox.CommandLine" Version="1.0.0" />
     <PackageReference Include="EluciusFTW.SpectreCoff" Version="0.47.28" />
     <PackageReference Include="Fake.IO.FileSystem" Version="6.0.0" />
     <PackageReference Include="SimpleExec" Version="11.0.0" />
     <PackageReference Include="Spectre.Console" Version="0.47.0" />
-    <PackageReference Update="FSharp.Core" Version="7.0.400" />
     <PackageReference Include="Thoth.Json.Net" Version="11.0.0" />
     <PackageReference Include="Octokit" Version="8.0.0" />
     <PackageReference Include="Semver" Version="2.3.0" />
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
     "version": "6.0.100",
-    "rollForward": "latestMinor"
+    "rollForward": "latestMajor"
   }
 }
diff --git a/package.json b/package.json
@@ -7,9 +7,9 @@
     "rollup": "rollup",
     "terser": "terser",
     "tslint": "tslint",
-    "build": "dotnet fsi build.fsx",
-    "publish": "dotnet fsi build.fsx publish",
-    "test": "dotnet fsi build.fsx test",
+    "build": "dotnet run --project build/Build.fsproj",
+    "publish": "dotnet run --project build/Build.fsproj publish",
+    "test": "dotnet run --project build/Build.fsproj test",
     "build-compiler-js": "dotnet fable src/fable-compiler-js/src/fable-compiler-js.fsproj -o build/fable-compiler-js/out",
     "postbuild-compiler-js": "rollup build/fable-compiler-js/out/app.js --file src/fable-compiler-js/dist/app.js --format umd --name Fable",
     "minify-compiler-js": "terser src/fable-compiler-js/dist/app.js -o src/fable-compiler-js/dist/app.min.js --mangle --compress",
diff --git a/src/Fable.Cli/Fable.Cli.fsproj b/src/Fable.Cli/Fable.Cli.fsproj
@@ -61,8 +61,8 @@
     <Reference Include="../../lib/fcs/FSharp.Core.dll" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Buildalyzer" Version="4.1.6" />
-    <PackageReference Include="FSharp.SystemTextJson" Version="0.17.4" />
-    <PackageReference Include="source-map-sharp" Version="1.0.8" />
+    <PackageReference Include="Buildalyzer" Version="5.0.1" />
+    <PackageReference Include="FSharp.SystemTextJson" Version="1.2.42" />
+    <PackageReference Include="source-map-sharp" Version="1.0.9" />
   </ItemGroup>
 </Project>
diff --git a/src/Fable.PublishUtils/Fable.PublishUtils.fsproj b/src/Fable.PublishUtils/Fable.PublishUtils.fsproj
@@ -2,6 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
+    <RollForward>Major</RollForward>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Version>2.4.0</Version>
   </PropertyGroup>
diff --git a/src/Fable.Transforms/Fable.Transforms.fsproj b/src/Fable.Transforms/Fable.Transforms.fsproj
@@ -47,7 +47,6 @@
     <ProjectReference Include="Rust/AST/Rust.AST.fsproj" />
   </ItemGroup>
   <ItemGroup>
-    <!-- <PackageReference Include="FSharp.Compiler.Service" Version="40.0" /> -->
     <Reference Include="../../lib/fcs/FSharp.Core.dll" />
     <Reference Include="../../lib/fcs/FSharp.Compiler.Service.dll" />
   </ItemGroup>
diff --git a/src/Fable.Transforms/Fable2Babel.fs b/src/Fable.Transforms/Fable2Babel.fs
@@ -347,7 +347,7 @@ module Reflection =
         | Fable.Any -> Expression.booleanLiteral(true)
         | Fable.Unit -> com.TransformAsExpr(ctx, expr) |> Util.makeNullCheck range true
         | Fable.Boolean -> jsTypeof "boolean" expr
-        | Fable.Char | Fable.String _ -> jsTypeof "string" expr
+        | Fable.Char | Fable.String -> jsTypeof "string" expr
         | Fable.Number(Decimal,_) -> jsInstanceof (libValue com ctx "Decimal" "default") expr
         | Fable.Number(JS.Replacements.BigIntegers _, _) -> jsTypeof "bigint" expr
         | Fable.Number _ -> jsTypeof "number" expr
diff --git a/src/Fable.Transforms/FableTransforms.fs b/src/Fable.Transforms/FableTransforms.fs
@@ -125,7 +125,7 @@ let noSideEffectBeforeIdent identName expr =
         | Get(_, ExprGet _, _, _) ->
             sideEffect <- true
             true
-        | Get(e, (TupleIndex _|UnionField _|UnionTag|ListHead|ListTail|OptionValue _), _, _) ->
+        | Get(e, (TupleIndex _|UnionField _|UnionTag|ListHead|ListTail|OptionValue), _, _) ->
             findIdentOrSideEffect e
         | Import _ | Lambda _ | Delegate _ -> false
         | Extended((Throw _|Debugger),_) -> true
diff --git a/src/Fable.Transforms/Php/Fable2Php.fs b/src/Fable.Transforms/Php/Fable2Php.fs
@@ -1175,7 +1175,7 @@ and convertMatching (com: IPhpCompiler) input guard thenExpr elseExpr expr retur
                             com.AddLocalVar(fixName t, false)
                             PhpAssign(PhpVar(fixName t, None), PhpConst(PhpConstNumber(float i)))
                             PhpBreak None
-                      | Return _ ->
+                      | Return ->
                             yield! convertExprToStatement com target returnStrategy
                       | _ ->
                             yield! convertExprToStatement com target returnStrategy
@@ -1214,7 +1214,7 @@ and convertExprToStatement (com: IPhpCompiler) expr returnStrategy =
                                 yield! convertExprToStatement com expr returnStrategy
                             | None -> ()
                             match returnStrategy with
-                            | Return _ -> ()
+                            | Return -> ()
                             | _ -> PhpBreak None;
                         ]
 
@@ -1306,7 +1306,7 @@ and convertExprToStatement (com: IPhpCompiler) expr returnStrategy =
     | Fable.Extended(Fable.Throw(expr, _ ),_) ->
         match expr with
         | None -> failwith "TODO: rethrow"
-        | Some (Fable.Call (Fable.IdentExpr expr, args, _, _)) when expr.Name = "Error" -> 
+        | Some (Fable.Call (Fable.IdentExpr expr, args, _, _)) when expr.Name = "Error" ->
             [ PhpThrow (PhpNew (ExType { Name="Exception"; Namespace=Some ""; Class=None }, List.map (convertExpr com) args.Args))]
         | Some expr -> [ PhpThrow(convertExpr com expr)]
     | Fable.Extended(Fable.Curry(expr, arrity),_) ->
diff --git a/src/Fable.Transforms/Python/Fable2Python.fs b/src/Fable.Transforms/Python/Fable2Python.fs
@@ -46,10 +46,9 @@ type BoundVars =
         enclosingScope.UnionWith(this.EnclosingScope)
         enclosingScope.UnionWith(this.LocalScope)
 
-        { this with
-            LocalScope = HashSet()
-            EnclosingScope = enclosingScope
-            Inceptions = this.Inceptions + 1 }
+        { LocalScope = HashSet()
+          EnclosingScope = enclosingScope
+          Inceptions = this.Inceptions + 1 }
 
     member this.Bind(name: string) =
         this.LocalScope.Add name |> ignore
@@ -419,7 +418,7 @@ module Reflection =
             Expression.compare (expr, [ Is ], [ Util.undefined None ], ?loc = range), stmts
         | Fable.Boolean -> pyTypeof "<class 'bool'>" expr
         | Fable.Char
-        | Fable.String _ -> pyTypeof "<class 'str'>" expr
+        | Fable.String -> pyTypeof "<class 'str'>" expr
         | Fable.Number (kind, b) ->
             match kind, typ with
             | _, Fable.Type.Number (UInt8, _) -> pyTypeof "<fable_modules.fable_library.types.uint8'>>" expr
diff --git a/src/Fable.Transforms/Rust/AST/Tests/Rust.AST.Tests.fsproj b/src/Fable.Transforms/Rust/AST/Tests/Rust.AST.Tests.fsproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
+    <RollForward>Major</RollForward>
     <IsPackable>false</IsPackable>
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
diff --git a/src/Fable.Transforms/Rust/Fable2Rust.fs b/src/Fable.Transforms/Rust/Fable2Rust.fs
@@ -573,7 +573,7 @@ module TypeInfo =
         | Fable.Number(BigInt, _) -> false
         | Fable.Unit
         | Fable.Boolean
-        | Fable.Char _
+        | Fable.Char
         | Fable.Number _ // all numbers except BigInt
             -> true
         | _ -> false
diff --git a/src/Fable.Transforms/State.fs b/src/Fable.Transforms/State.fs
@@ -90,7 +90,7 @@ type Assemblies(getPlugin, fsharpAssemblies: FSharpAssembly list) =
         ({ MemberDeclarationPlugins = Map.empty }, plugins)
         ||> Seq.fold (fun acc kv ->
             if kv.Value.IsSubclassOf(typeof<MemberDeclarationPluginAttribute>) then
-                { acc with MemberDeclarationPlugins = Map.add kv.Key kv.Value acc.MemberDeclarationPlugins }
+                { MemberDeclarationPlugins = Map.add kv.Key kv.Value acc.MemberDeclarationPlugins }
             else acc)
 
     let tryFindEntityByPath (entityFullName: string) (asm: FSharpAssembly) =
diff --git a/src/fable-compiler-js/src/fable-compiler-js.fsproj b/src/fable-compiler-js/src/fable-compiler-js.fsproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
-    <!-- <RollForward>Major</RollForward> -->
+    <RollForward>Major</RollForward>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/fable-library-py/fable_library/double.py b/src/fable-library-py/fable_library/double.py
@@ -58,7 +58,7 @@ def parse(value: Any) -> float:
     try:
         return float(value)
     except Exception:
-        raise ValueError("Input string was not in a correct format.")
+        raise ValueError(f"The input string {value} was not in a correct format.")
 
 
 def try_parse(string: str, def_value: FSharpRef[float]) -> bool:
diff --git a/src/fable-library-py/fable_library/int32.py b/src/fable-library-py/fable_library/int32.py
@@ -30,7 +30,7 @@ def parse(
     try:
         v = int(string, base=radix)
     except Exception:
-        raise ValueError("Input string was not in a correct format.")
+        raise ValueError(f"The input string {string} was not in a correct format.")
 
     (umin, umax) = get_range(True, bitsize)
     if not unsigned and radix != 10 and v >= umin and v <= umax:
@@ -42,7 +42,7 @@ def parse(
     if v >= min and v <= max:
         return v
 
-    raise ValueError("Input string was not in a correct format.")
+    raise ValueError(f"The input string {string} was not in a correct format.")
 
 
 def try_parse(
diff --git a/src/fable-library-py/fable_library/long.py b/src/fable-library-py/fable_library/long.py
@@ -122,7 +122,7 @@ def parse(
     try:
         v = int(string, base=radix)
     except Exception:
-        raise ValueError("Input string was not in a correct format.")
+        raise ValueError(f"The input string {string} was not in a correct format.")
 
     (umin, umax) = get_range(True)
     if not unsigned and radix != 10 and v >= umin and v <= umax:
@@ -134,7 +134,7 @@ def parse(
     if v >= min and v <= max:
         return v
 
-    raise ValueError("Input string was not in a correct format.")
+    raise ValueError(f"The input string {string} was not in a correct format.")
 
 
 def try_parse(
diff --git a/src/fable-library-rust/src/BigInt.rs b/src/fable-library-rust/src/BigInt.rs
@@ -211,7 +211,7 @@ pub mod BigInt_ {
     pub fn parse(s: string) -> bigint {
         match BigInt::from_str_radix(s.trim(), 10) {
             Ok(d) => d.into(),
-            Err(e) => panic!("Input string was not in a correct format."),
+            Err(e) => panic!("The input string {} was not in a correct format.", s),
         }
     }
 
diff --git a/src/fable-library-rust/src/DateOnly.rs b/src/fable-library-rust/src/DateOnly.rs
@@ -158,7 +158,7 @@ pub mod DateOnly_ {
         pub fn parse(s: string) -> DateOnly {
             match Self::try_parse_str(s.trim()) {
                 Ok(nd) => DateOnly(nd),
-                Err(e) => panic!("Input string was not in a correct format."),
+                Err(e) => panic!("The input string {} was not in a correct format.", s),
             }
         }
     }
diff --git a/src/fable-library-rust/src/DateTime.rs b/src/fable-library-rust/src/DateTime.rs
@@ -501,7 +501,7 @@ pub mod DateTime_ {
         pub fn parse(s: string) -> DateTime {
             match Self::try_parse_str(s.trim()) {
                 Ok(dt) => dt,
-                Err(e) => panic!("Input string was not in a correct format."),
+                Err(e) => panic!("The input string {} was not in a correct format.", s),
             }
         }
 
diff --git a/src/fable-library-rust/src/DateTimeOffset.rs b/src/fable-library-rust/src/DateTimeOffset.rs
@@ -436,7 +436,7 @@ pub mod DateTimeOffset_ {
         pub fn parse(s: string) -> DateTimeOffset {
             match Self::try_parse_str(s.trim()) {
                 Ok(dt) => DateTimeOffset(dt.into()),
-                Err(e) => panic!("Input string was not in a correct format."),
+                Err(e) => panic!("The input string {} was not in a correct format.", s),
             }
         }
     }
diff --git a/src/fable-library-rust/src/Decimal.rs b/src/fable-library-rust/src/Decimal.rs
@@ -88,7 +88,7 @@ pub mod Decimal_ {
     pub fn parse(s: string) -> decimal {
         match Decimal::from_str(s.trim()) {
             Ok(d) => d,
-            Err(e) => panic!("Input string was not in a correct format."),
+            Err(e) => panic!("The input string {} was not in a correct format.", s),
         }
     }
 
diff --git a/src/fable-library-rust/src/TimeOnly.rs b/src/fable-library-rust/src/TimeOnly.rs
@@ -230,7 +230,7 @@ pub mod TimeOnly_ {
         pub fn parse(s: string) -> TimeOnly {
             match Self::try_parse_str(s.trim()) {
                 Ok(nt) => TimeOnly(nt),
-                Err(e) => panic!("Input string was not in a correct format."),
+                Err(e) => panic!("The input string {} was not in a correct format.", s),
             }
         }
     }
diff --git a/src/fable-library/Decimal.ts b/src/fable-library/Decimal.ts
@@ -135,7 +135,7 @@ export function parse(str: string): Decimal {
   if (tryParse(str, defValue)) {
     return defValue.contents;
   } else {
-    throw new Error("Input string was not in a correct format.");
+    throw new Error(`The input string ${str} was not in a correct format.`);
   }
 }
 
diff --git a/src/fable-library/Double.ts b/src/fable-library/Double.ts
@@ -17,7 +17,7 @@ export function parse(str: string): number {
   if (tryParse(str, defValue)) {
     return defValue.contents;
   } else {
-    throw new Error("Input string was not in a correct format.");
+    throw new Error(`The input string ${str} was not in a correct format.`);
   }
 }
 
diff --git a/src/fable-library/Int32.ts b/src/fable-library/Int32.ts
@@ -118,7 +118,7 @@ export function parse(str: string, style: number, unsigned: boolean, bitsize: nu
       }
     }
   }
-  throw new Error("Input string was not in a correct format.");
+  throw new Error(`The input string ${str} was not in a correct format.`);
 }
 
 export function tryParse(str: string, style: number, unsigned: boolean, bitsize: number, defValue: FSharpRef<number>): boolean {
diff --git a/src/fable-library/Long.ts b/src/fable-library/Long.ts
@@ -36,7 +36,7 @@ export function parse(str: string, style: number, unsigned: boolean, _bitsize: n
       return fromString(str);
     }
   }
-  throw new Error("Input string was not in a correct format.");
+  throw new Error(`The input string ${str} was not in a correct format.`);
 }
 
 export function tryParse(str: string, style: number, unsigned: boolean, bitsize: number, defValue: FSharpRef<bigint>) {
diff --git a/src/fable-standalone/test/bench-compiler/bench-compiler.fsproj b/src/fable-standalone/test/bench-compiler/bench-compiler.fsproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
-    <!-- <RollForward>Major</RollForward> -->
+    <TargetFramework>net6.0</TargetFramework>
+    <RollForward>Major</RollForward>
     <DefineConstants>$(DefineConstants);DOTNET_FILE_SYSTEM</DefineConstants>
     <OtherFlags>$(OtherFlags) --crossoptimize-</OtherFlags>
   </PropertyGroup>
diff --git a/src/fable-standalone/test/bench/bench.fsproj b/src/fable-standalone/test/bench/bench.fsproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
-    <!-- <RollForward>Major</RollForward> -->
+    <RollForward>Major</RollForward>
     <DefineConstants>$(DefineConstants);DOTNET_FILE_SYSTEM</DefineConstants>
   </PropertyGroup>
 
diff --git a/src/fcs-fable/test/fcs-fable-test.fsproj b/src/fcs-fable/test/fcs-fable-test.fsproj
@@ -20,7 +20,7 @@
   <ItemGroup>
     <!-- <PackageReference Include="FSharp.Core" Version="7.0.0" /> -->
     <!-- <Reference Include="../../../artifacts/bin/FSharp.Compiler.Service/Release/netstandard2.0/FSharp.Core.dll" /> -->
-    <PackageReference Include="Fable.Core" Version="4.0.0-*" />
+    <PackageReference Include="Fable.Core" Version="4.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/Dart/src/Fable.Tests.Dart.fsproj b/tests/Dart/src/Fable.Tests.Dart.fsproj
@@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+    <RollForward>Major</RollForward>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="FSharp.Core" Version="7.0.0" />
     <ProjectReference Include="../../../src/Fable.Core/Fable.Core.fsproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/tests/Dart/src/StringTests.fs b/tests/Dart/src/StringTests.fs
@@ -1078,4 +1078,8 @@ let tests() =
 //          let s4: FormattableString = $"I have `backticks`"
 //          s4.Format |> equal "I have `backticks`"
 //          let s5: FormattableString = $"I have {{escaped braces}} and %%percentage%%"
-//          s5.Format |> equal "I have {escaped braces} and %percentage%"
+// #if NET8_0_OR_GREATER
+//             s5.Format |> equal "I have {{escaped braces}} and %percentage%"
+// #elif FABLE_COMPILER
+//             s5.Format |> equal "I have {escaped braces} and %percentage%"
+// #endif
diff --git a/tests/Integration/Compiler/TestProject/TestProject.fsproj b/tests/Integration/Compiler/TestProject/TestProject.fsproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
+    <RollForward>Major</RollForward>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/Integration/Integration/data/signatureHidesFunction/signatureHidesFunction.fsproj b/tests/Integration/Integration/data/signatureHidesFunction/signatureHidesFunction.fsproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
+    <RollForward>Major</RollForward>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
@@ -11,8 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fable.Core" Version="4.0.0" />
-      <PackageReference Update="FSharp.Core" Version="7.0.400" />
+    <PackageReference Include="Fable.Core" Version="4.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/Integration/ProjectConfigs/ConsoleApp/Fable.Tests.ConsoleApp.fsproj b/tests/Integration/ProjectConfigs/ConsoleApp/Fable.Tests.ConsoleApp.fsproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
+    <RollForward>Major</RollForward>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/Js/Main/ConvertTests.fs b/tests/Js/Main/ConvertTests.fs
diff --git a/tests/Js/Main/DateOnlyTests.fs b/tests/Js/Main/DateOnlyTests.fs
diff --git a/tests/Js/Main/Fable.Tests.fsproj b/tests/Js/Main/Fable.Tests.fsproj
diff --git a/tests/Js/Main/StringTests.fs b/tests/Js/Main/StringTests.fs
diff --git a/tests/Js/Main/TimeOnlyTests.fs b/tests/Js/Main/TimeOnlyTests.fs
diff --git a/tests/Php/Fable.Tests.Php.fsproj b/tests/Php/Fable.Tests.Php.fsproj
diff --git a/tests/Python/Fable.Tests.Python.fsproj b/tests/Python/Fable.Tests.Python.fsproj
diff --git a/tests/Python/TestConvert.fs b/tests/Python/TestConvert.fs
diff --git a/tests/Rust/Fable.Tests.Rust.fsproj b/tests/Rust/Fable.Tests.Rust.fsproj
diff --git a/tests/Rust/tests/src/DateOnlyTests.fs b/tests/Rust/tests/src/DateOnlyTests.fs
diff --git a/tests/Rust/tests/src/StringTests.fs b/tests/Rust/tests/src/StringTests.fs
diff --git a/tests/Rust/tests/src/TimeOnlyTests.fs b/tests/Rust/tests/src/TimeOnlyTests.fs
diff --git a/tests/TypeScript/Fable.Tests.TypeScript.fsproj b/tests/TypeScript/Fable.Tests.TypeScript.fsproj

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`	`3`	`"version": "6.0.100",`
`4`		`- "rollForward": "latestMinor"`
	`4`	`+ "rollForward": "latestMajor"`
`5`	`5`	`}`
`6`	`6`	`}`