remove more assemblyinfo generation

fsprojects · Aug 31, 2021 · 6744ab9 · 6744ab9
1 parent f5fd07f
commit 6744ab9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 13 deletions.
diff --git a/build.fsx b/build.fsx
@@ -7,7 +7,6 @@ System.IO.Directory.SetCurrentDirectory __SOURCE_DIRECTORY__
 
 open Fake
 open Fake.Git
-open Fake.AssemblyInfoFile
 open Fake.ReleaseNotesHelper
 open Fake.UserInputHelper
 open System

diff --git a/integrationtests/Paket.IntegrationTests/AssemblyInfo.fs b/integrationtests/Paket.IntegrationTests/AssemblyInfo.fs
diff --git a/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj b/integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj
@@ -11,7 +11,6 @@
       <Paket>True</Paket>
       <Link>FsUnit.fs</Link>
     </Compile>
-    <Compile Include="AssemblyInfo.fs" />
     <Compile Include="TestHelper.fs" />
     <Compile Include="NugetDownloadSpecs.fs" />
     <Compile Include="InitSpecs.fs" />

diff --git a/src/Paket/Program.fs b/src/Paket/Program.fs
@@ -21,7 +21,11 @@ type PaketExiter() =
                 tracen msg ; exit 0
             else traceError msg ; exit 1
 
-let paketVersion = AssemblyVersionInformation.AssemblyInformationalVersion
+let paketVersion =
+  let attrs = System.Reflection.Assembly.GetExecutingAssembly().GetCustomAttributes(false)
+
+  attrs
+  |> Seq.pick (fun a -> match a with | :? System.Reflection.AssemblyInformationalVersionAttribute as i -> Some i.InformationalVersion | _ -> None)
 
 let mutable tracedVersion = false
 

diff --git a/tests/Paket.Tests/Paket.Tests.fsproj b/tests/Paket.Tests/Paket.Tests.fsproj
@@ -4,7 +4,11 @@
     <OutputType>Library</OutputType>
     <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <!-- these three properties are set for some tests around assembly metadata parsing.
+         they're written to the generated AssemblyInfo.fs -->
+    <Version>1.0.0</Version>
+    <Authors>Two,Authors</Authors>
+    <Description>A description</Description>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' != 'net461'">
     <DefineConstants>WEBPROXY_NETSTANDARD;TESTSUITE_RUNS_ON_DOTNETCORE;NO_UNIT_PLATFORMATTRIBUTE;NO_UNIT_TIMEOUTATTRIBUTE;@(DefineConstants)</DefineConstants>