diff --git a/.github/workflows/Nuget.yml b/.github/workflows/Nuget.yml index d625e36d3..95ec524fa 100644 --- a/.github/workflows/Nuget.yml +++ b/.github/workflows/Nuget.yml @@ -92,3 +92,12 @@ jobs: dotnet pack -c Release -p:PackageVersion=${{ steps.version.outputs.version }} cd bin/Release dotnet nuget push AngouriMath.Interactive.${{ steps.version.outputs.version }}.nupkg --api-key ${{ steps.version.outputs.apikey }} --source "${{ steps.version.outputs.source }}" + + - name: 'Pack and publish AngouriMath.Terminal' + run: | + cd Sources/Terminal/AngouriMath.Terminal + dotnet restore + dotnet build -c Release + dotnet pack -c Release -p:PackageVersion=${{ steps.version.outputs.version }} + cd bin/Release + dotnet nuget push AngouriMath.Terminal.${{ steps.version.outputs.version }}.nupkg --api-key ${{ steps.version.outputs.apikey }} --source "${{ steps.version.outputs.source }}" diff --git a/Sources/Terminal/AngouriMath.Terminal/AngouriMath.Terminal.fsproj b/Sources/Terminal/AngouriMath.Terminal/AngouriMath.Terminal.fsproj index 2a38d825e..28e902cd5 100644 --- a/Sources/Terminal/AngouriMath.Terminal/AngouriMath.Terminal.fsproj +++ b/Sources/Terminal/AngouriMath.Terminal/AngouriMath.Terminal.fsproj @@ -13,8 +13,6 @@ icon.png F#-based command line interface for symbolic algebra library AngouriMath - 1.4.0-preview.3-2 - $(PackageTags), cli, terminal @@ -28,9 +26,9 @@ - - - + + + diff --git a/Sources/Terminal/AngouriMath.Terminal/Program.fs b/Sources/Terminal/AngouriMath.Terminal/Program.fs index f2f3bd2d6..a316736b2 100644 --- a/Sources/Terminal/AngouriMath.Terminal/Program.fs +++ b/Sources/Terminal/AngouriMath.Terminal/Program.fs @@ -17,7 +17,7 @@ let lineEditor = getLineEditor AnsiConsole.Console let rec readAndRespond kernel = printf "\n" - match readLine lineEditor |> execute kernel with + match readLine lineEditor |> nonNull |> execute kernel with | PlainTextSuccess text -> writeLine AnsiConsole.Console text | LatexSuccess (_, text) -> @@ -36,23 +36,16 @@ let handleErrors errors = "\n\n" |> Console.Write -FigletText "AngouriMath" -|> AlignableExtensions.Centered -|> (fun p -> FigletTextExtensions.Color(p, Color.Pink1)) +FigletText("AngouriMath", Justification = Justify.Center, Color = Color.Pink1) |> AnsiConsole.Console.Write -$@" +Markup($@" Hi! Type `help ()` to get more info. -" |> Markup - |> AlignableExtensions.Centered - |> AnsiConsole.Console.Write - - - +", Justification = Justify.Center) +|> AnsiConsole.Console.Write printf "Starting the kernel..." - match createKernel () with | Result.Error reasons -> handleErrors reasons | Result.Ok kernel -> diff --git a/Sources/Wrappers/AngouriMath.FSharp/AngouriMath.FSharp.fsproj b/Sources/Wrappers/AngouriMath.FSharp/AngouriMath.FSharp.fsproj index eee02b6ed..35dc185d8 100644 --- a/Sources/Wrappers/AngouriMath.FSharp/AngouriMath.FSharp.fsproj +++ b/Sources/Wrappers/AngouriMath.FSharp/AngouriMath.FSharp.fsproj @@ -32,7 +32,7 @@ - + diff --git a/Sources/Wrappers/AngouriMath.Interactive/AngouriMath.Interactive.fsproj b/Sources/Wrappers/AngouriMath.Interactive/AngouriMath.Interactive.fsproj index 0400c7495..e600d0876 100644 --- a/Sources/Wrappers/AngouriMath.Interactive/AngouriMath.Interactive.fsproj +++ b/Sources/Wrappers/AngouriMath.Interactive/AngouriMath.Interactive.fsproj @@ -39,7 +39,10 @@ - + + + +