Updates to build process

build.fsx

@@ -1,4 +1,3 @@
-open System
 // --------------------------------------------------------------------------------------
 // FAKE build script
 // --------------------------------------------------------------------------------------
@@ -23,7 +22,6 @@ open Fake.Api
 // --------------------------------------------------------------------------------------
 
 let project = "Forge"
-
 let summary = "Forge is a build tool that provides tasks for creating, compiling, and testing F# projects"
 
 let gitOwner = "ionide"
@@ -35,12 +33,16 @@ let gitRaw = Environment.environVarOrDefault "gitRaw" ("https://raw.github.com/"
 // Build variables
 // --------------------------------------------------------------------------------------
 
-let buildDir  = "./build/"
 let dotnetcliVersion = DotNet.getSDKVersionFromGlobalJson()
-
 System.Environment.CurrentDirectory <- __SOURCE_DIRECTORY__
 let release = ReleaseNotes.parse (System.IO.File.ReadAllLines "RELEASE_NOTES.md")
 
+let tempDir = "./temp"
+let testBuildDir = "./temp/test"
+let buildDir = __SOURCE_DIRECTORY__ </> "temp"
+let forgeSh = "./forge.sh"
+
+
 // --------------------------------------------------------------------------------------
 // Helpers
 // --------------------------------------------------------------------------------------
@@ -109,6 +111,17 @@ Target.create "Build" (fun _ ->
     DotNet.build id ""
 )
 
+Target.create "Publish" (fun _ ->
+    DotNet.publish (fun p -> {p with OutputPath = Some (buildDir </> "Bin")}) "src/Forge"
+
+    !! (buildDir </> "Bin" </> "*.pdb")
+    ++ (buildDir </>  "Bin" </>"*.xml")
+    |> File.deleteAll
+
+    Shell.copyFile buildDir forgeSh
+
+)
+
 Target.create "Test" (fun _ ->
     exec "dotnet"  @"run --project .\tests\Forge.Tests\Forge.Tests.fsproj" "."
     //exec "dotnet"  @"run --project .\tests\Forge.IntegrationTests\Forge.IntegrationTests.fsproj" "."
@@ -187,6 +200,7 @@ Target.create "Release" DoNothing
   ==> "AssemblyInfo"
   ==> "Restore"
   ==> "Build"
+  ==> "Publish"
   ==> "Test"
   ==> "Default"
 

forge.sh

@@ -2,4 +2,4 @@
 # User just ran a symbolic link which points to real Forge.exe
 # $0 is an absolute path of this symboliklink
 # $* stands for all arguments passed to the command
-mono "$(dirname $(readlink $0))/Forge.exe" $*
+dotnet "Bin/Forge.dll" $*

src/Forge/Forge.fsproj

@@ -2,7 +2,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
@@ -17,7 +16,6 @@
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="Commands.fs" />
     <Compile Include="Program.fs" />
-    <None Include="app.config" />
     <Content Include="Tools/Paket/paket.bootstrapper.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

tests/Forge.IntegrationTests/Forge.IntegrationTests.fsproj

@@ -2,7 +2,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
@@ -20,7 +19,6 @@
     <Compile Include="Helpers.fs" />
     <Compile Include="Tests.fs" />
     <Compile Include="Main.fs" />
-    <None Include="app.config" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>

tests/Forge.Tests/Forge.Tests.fsproj

@@ -2,7 +2,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
@@ -17,7 +16,6 @@
     <Compile Include="common.fs" />
     <Compile Include="Tests.fs" />
     <Compile Include="Main.fs" />
-    <None Include="app.config" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>