Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP - Fsi module #1970

Merged
merged 17 commits into from
Jun 9, 2018
Merged

WIP - Fsi module #1970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5458b35
Split fsi into a shell module and an external exe module
vanceism7 May 14, 2018
9807147
WIP - Added params type for fsi args
vanceism7 May 22, 2018
3bf938b
Split FsiHelper into two modules: exe and service
vanceism7 May 22, 2018
f01044f
Cleaned up code, fixed script args issue
vanceism7 May 24, 2018
7235eff
Removed std out redirection
vanceism7 May 28, 2018
dca603d
Split fsi into a shell module and an external exe module
vanceism7 May 14, 2018
e348531
WIP - Added params type for fsi args
vanceism7 May 22, 2018
158870e
Split FsiHelper into two modules: exe and service
vanceism7 May 22, 2018
982c173
Cleaned up code, fixed script args issue
vanceism7 May 24, 2018
2dbfba8
Removed std out redirection
vanceism7 May 28, 2018
e78e279
Merge branch 'FsiModule' of https://github.com/vanceism7/FAKE into Fs…
vanceism7 May 29, 2018
863939e
Readded FSI environment var for consistency with fsihelper
vanceism7 May 29, 2018
0415587
Combined all files back into fsi.fs file. Added internal fsi runner
vanceism7 Jun 5, 2018
2bc4483
Added fsi module to fsproj files
vanceism7 Jun 7, 2018
e7ddb0f
Merge branch 'master' into FsiModule
vanceism7 Jun 7, 2018
f722f2b
dummy commit
vanceism7 Jun 8, 2018
2063ee5
Changed internal fsi runner to return string list
vanceism7 Jun 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 74 additions & 59 deletions Fake.sln
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,7 @@ let dotnetAssemblyInfos =
"Fake.DotNet.AssemblyInfoFile", "Writing AssemblyInfo files"
"Fake.DotNet.Cli", "Running the dotnet cli"
"Fake.DotNet.Fsc", "Running the f# compiler - fsc"
"Fake.DotNet.Fsi", "FSharp Interactive - fsi"
"Fake.DotNet.FSFormatting", "Running fsformatting.exe and generating documentation"
"Fake.DotNet.Mage", "Manifest Generation and Editing Tool"
"Fake.DotNet.MSBuild", "Running msbuild"
Expand Down
1 change: 1 addition & 0 deletions help/templates/template.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
<li><a href="/dotnet-cli.html">Cli</a></li>
<li><a href="/dotnet-assemblyinfo.html">AssemblyInfoFile</a></li>
<li><a href="/apidocs/v5/fake-dotnet-fsc.html">Fsc</a></li>
<li><a href="/apidocs/v5/fake-dotnet-fsi.html">Fsi</a></li>
<li><a href="/apidocs/v5/fake-dotnet-msbuild.html">MSBuild</a></li>
<li><a href="/apidocs/v5/fake-dotnet-testing-nunit3.html">Testing - NUnit</a></li>
<li><a href="/apidocs/v5/fake-dotnet-testing-mspec.html">Testing - MSpec</a></li>
Expand Down
17 changes: 17 additions & 0 deletions src/app/Fake.DotNet.Fsi/AssemblyInfo.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Auto-Generated by FAKE; do not edit
namespace System
open System.Reflection

[<assembly: AssemblyTitleAttribute("FAKE - F# Make FSharp Interactive - fsi")>]
[<assembly: AssemblyProductAttribute("FAKE - F# Make")>]
[<assembly: AssemblyVersionAttribute("5.0.0")>]
[<assembly: AssemblyInformationalVersionAttribute("5.0.0-beta025")>]
[<assembly: AssemblyFileVersionAttribute("5.0.0")>]
do ()

module internal AssemblyVersionInformation =
let [<Literal>] AssemblyTitle = "FAKE - F# Make FSharp Interactive - fsi"
let [<Literal>] AssemblyProduct = "FAKE - F# Make"
let [<Literal>] AssemblyVersion = "5.0.0"
let [<Literal>] AssemblyInformationalVersion = "5.0.0-beta025"
let [<Literal>] AssemblyFileVersion = "5.0.0"
28 changes: 28 additions & 0 deletions src/app/Fake.DotNet.Fsi/Fake.DotNet.Fsi.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
<AssemblyName>Fake.DotNet.Fsi</AssemblyName>
<OutputType>Library</OutputType>
</PropertyGroup>
<PropertyGroup>
<DefineConstants>$(DefineConstants);FX_NO_REMOTING;USE_ASYNC_LOCAL</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="Fsi.fs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Fake.Core.Environment\Fake.Core.Environment.fsproj" />
<ProjectReference Include="..\Fake.Core.Process\Fake.Core.Process.fsproj" />
<ProjectReference Include="..\Fake.Core.Trace\Fake.Core.Trace.fsproj" />
<ProjectReference Include="..\Fake.Core.String\Fake.Core.String.fsproj" />
<ProjectReference Include="..\Fake.IO.FileSystem\Fake.IO.FileSystem.fsproj" />
<ProjectReference Include="..\Fake.DotNet.MSBuild\Fake.DotNet.MSBuild.fsproj" />
<ProjectReference Include="..\Fake.Tools.Git\Fake.Tools.Git.fsproj" />

</ItemGroup>
<Import Project="..\..\..\.paket\Paket.Restore.targets" />
</Project>
Loading