use generated assemblyinfo

ionide · May 7, 2022 · 023db81 · 023db81
1 parent b0a00ed
commit 023db81
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 38 deletions.
diff --git a/build.fsx b/build.fsx
@@ -57,6 +57,7 @@ let runTool cmd args workingDir =
 let getBuildParam = Environment.environVar
 
 let DoNothing = ignore
+
 // --------------------------------------------------------------------------------------
 // Build Targets
 // --------------------------------------------------------------------------------------

diff --git a/src/Fornax.Core/AssemblyInfo.fs b/src/Fornax.Core/AssemblyInfo.fs
diff --git a/src/Fornax.Core/Fornax.Core.fsproj b/src/Fornax.Core/Fornax.Core.fsproj
@@ -6,7 +6,6 @@
     <TargetFrameWork>netstandard2.0</TargetFrameWork>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="AssemblyInfo.fs" />
     <Compile Include="Model.fs" />
     <None Include="paket.references" />
   </ItemGroup>

diff --git a/src/Fornax/AssemblyInfo.fs b/src/Fornax/AssemblyInfo.fs
diff --git a/src/Fornax/Fornax.fs b/src/Fornax/Fornax.fs
@@ -12,6 +12,7 @@ open LibGit2Sharp
 open Suave.Sockets
 open Suave.Sockets.Control
 open Suave.WebSocket
+open System.Reflection
 
 type FornaxExiter () =
     interface IExiter with
@@ -268,8 +269,10 @@ let main argv =
             Console.ReadKey() |> ignore
             printfn "Exiting..."
             0
-        | Some Version ->
-            printfn "%s" AssemblyVersionInformation.AssemblyVersion
+        | Some Version -> 
+            let assy = Assembly.GetExecutingAssembly()
+            let v = assy.GetCustomAttributes<AssemblyVersionAttribute>() |> Seq.head
+            printfn "%s" v.Version
             0
         | Some Clean ->
             let publ = Path.Combine(cwd, "_public")

diff --git a/src/Fornax/Fornax.fsproj b/src/Fornax/Fornax.fsproj
@@ -9,7 +9,6 @@
   <ItemGroup>
     <ProjectReference Include="..\Fornax.Core\Fornax.Core.fsproj" />
 
-    <Compile Include="AssemblyInfo.fs" />
     <Compile Include="FSIRefs.fs" />
     <Compile Include="Generator.fs" />
     <Compile Include="Fornax.fs" />