Merge pull request #2 from MangelMaxime/patch-1

Various improvements / proposition
Freymaurer · Nov 20, 2023 · cbd0592 · cbd0592
2 parents 64e11e9 + 58664d4
commit cbd0592
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/build.sh b/build.sh
@@ -0,0 +1,4 @@
+#!/bin/sh -x
+
+dotnet tool restore
+dotnet run --project build/Build.fsproj -- $@
diff --git a/build/Helpers.fs b/build/Helpers.fs
@@ -85,9 +85,9 @@ let npm =
 
     createProcess npmPath
 
-let py =
+let python =
     let path =
-        match ProcessUtils.tryFindFileOnPath "py" with
+        match ProcessUtils.tryFindFileOnPath "python" with
         | Some path -> path
         | None ->
             "py was not found in path. Please install it and make sure it's available from your path."

diff --git a/build/TestTasks.fs b/build/TestTasks.fs
@@ -17,7 +17,7 @@ let runTestsDotNet = BuildTask.create "RunTestsDotnet" [clean; build;] {
 let runTestsPy = BuildTask.create "RunTestsPy" [clean; build;] {
     for test in ProjectInfo.testProjects do
         run dotnet $"fable {test} --lang py -o {test}/py" ""
-        run py $"{test}/py/main.py" ""
+        run python $"{test}/py/main.py" ""
 }
 
 let runTestsJs = BuildTask.create "RunTestsJs" [clean; build;] {

diff --git a/src/Fable.Pyxpecto.fsproj b/src/Fable.Pyxpecto.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
@@ -20,8 +20,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fable.Core" Version="4.0.0" />
-    <PackageReference Include="Fable.Python" Version="4.1.3" />
+    <PackageReference Include="Fable.Core" Version="4.1.0" />
+    <PackageReference Include="Fable.Python" Version="4.3.0" />
+    <PackageReference Update="FSharp.Core" Version="5.0.0" />
   </ItemGroup>
 
 	<ItemGroup>