Use AssemblyReader from FSharp.Data

fsprojects · Dec 9, 2015 · 6f15083 · 6f15083
1 parent 1e3c644
commit 6f15083
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 113 deletions.
diff --git a/integrationtests/Paket.IntegrationTests/App.config b/integrationtests/Paket.IntegrationTests/App.config
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <runtime>
-
-  <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+
+<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
   <dependentAssembly>
     <Paket>True</Paket>
     <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -13,5 +12,4 @@
     <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
     <bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="7.0.0.0" />
   </dependentAssembly>
-</assemblyBinding></runtime>
-</configuration>
+</assemblyBinding></runtime></configuration>
diff --git a/paket.dependencies b/paket.dependencies
@@ -6,6 +6,7 @@ nuget FSharp.Core redirects: force
 nuget Chessie
 
 github fsharp/FAKE src/app/FakeLib/Globbing/Globbing.fs
+github fsharp/FSharp.Data src/CommonProviderImplementation/AssemblyReader.fs
 
 group Build
 

diff --git a/paket.lock b/paket.lock
@@ -10,6 +10,9 @@ GITHUB
   remote: fsharp/FAKE
   specs:
     src/app/FakeLib/Globbing/Globbing.fs (917a86046700e4eaaa2aa09de7895e048eaaa1b1)
+  remote: fsharp/FSharp.Data
+  specs:
+    src/CommonProviderImplementation/AssemblyReader.fs (88ef75bb7a3e3638453a6e361eddb0e57cc8c409)
 GROUP Build
 NUGET
   remote: https://nuget.org/api/v2

diff --git a/src/Paket.Core/PackageMetaData.fs b/src/Paket.Core/PackageMetaData.fs
@@ -13,55 +13,21 @@ let (|CompleteTemplate|IncompleteTemplate|) templateFile =
     | { Contents = (CompleteInfo(core, optional)) } -> CompleteTemplate(core, optional)
     | _ -> IncompleteTemplate
 
-let (|Title|Description|Version|InformationalVersion|Company|Ignore|) (attribute : obj) = 
-    match attribute with
-    | :? AssemblyTitleAttribute as title ->
-        match title.Title with
-        | x when String.IsNullOrWhiteSpace x ->
-            Ignore
-        | x ->
-            Title x
-    | :? AssemblyDescriptionAttribute as description ->
-        match description.Description with
-        | x when String.IsNullOrWhiteSpace x ->
-            Ignore
-        | x ->
-            Description x
-    | :? AssemblyVersionAttribute as version ->
-        match version.Version with
-        | x when String.IsNullOrWhiteSpace x ->
-            Ignore
-        | x -> Version(SemVer.Parse x)
-    | :? AssemblyInformationalVersionAttribute as version -> 
-        match version.InformationalVersion with
-        | x when String.IsNullOrWhiteSpace x ->
-            Ignore
-        | x ->
-            try
-                InformationalVersion(SemVer.Parse x)
-            with 
-            | _ -> Ignore
-    | :? System.Reflection.AssemblyCompanyAttribute as company ->
-        match company.Company with
-        | x when String.IsNullOrWhiteSpace x ->
-            Ignore
-        | x -> Company x
-    | :? System.Reflection.CustomAttributeData as attr ->
-        try
-            match attr.AttributeType.FullName with
-            | "System.Reflection.AssemblyCompanyAttribute" -> Company(attr.ConstructorArguments.Item(0).Value.ToString())
-            | "System.Reflection.AssemblyDescriptionAttribute" -> Description(attr.ConstructorArguments.Item(0).Value.ToString())
-            | "System.Reflection.AssemblyTitleAttribute" -> Title(attr.ConstructorArguments.Item(0).Value.ToString())
-            | "System.Reflection.AssemblyVersionAttribute" -> Version(attr.ConstructorArguments.Item(0).Value.ToString() |> SemVer.Parse)
-            | "System.Reflection.AssemblyInformationalVersionAttribute" -> InformationalVersion(attr.ConstructorArguments.Item(0).Value.ToString() |> SemVer.Parse)
-            | _ -> Ignore
-        with
+let (|Title|Description|Version|InformationalVersion|Company|Ignore|) (attributeName:string,attributeValue:string) = 
+    try
+        match attributeName with
+        | "AssemblyCompanyAttribute" -> Company(attributeValue)
+        | "AssemblyDescriptionAttribute" -> Description(attributeValue)
+        | "AssemblyTitleAttribute" -> Title(attributeValue)
+        | "AssemblyVersionAttribute" -> Version(attributeValue |> SemVer.Parse)
+        | "AssemblyInformationalVersionAttribute" -> InformationalVersion(attributeValue|> SemVer.Parse)
         | _ -> Ignore
+    with
     | _ -> Ignore
 
 let getId (assembly : Assembly) (md : ProjectCoreInfo) = { md with Id = Some(assembly.GetName().Name) }
 
-let getVersion (assembly : Assembly) attributes = 
+let getVersion versionFromAssembly attributes = 
     let informational = 
         attributes |> Seq.tryPick (function 
                             | InformationalVersion v -> Some v
@@ -70,9 +36,9 @@ let getVersion (assembly : Assembly) attributes =
     | Some v -> informational
     | None -> 
         let fromAssembly = 
-            match assembly.GetName().Version with
-            | null -> None
-            | v -> Some(SemVer.Parse(v.ToString()))
+            match versionFromAssembly with
+            | None -> None
+            | Some v -> Some(SemVer.Parse(v.ToString()))
         match fromAssembly with
         | Some v -> fromAssembly
         | None -> 
@@ -101,29 +67,35 @@ let getDescription attributes =
                       | Description d -> Some d
                       | _ -> None) 
 
-let loadAssemblyId buildConfig buildPlatform (projectFile : ProjectFile) = 
+let readAssembly buildConfig buildPlatform (projectFile : ProjectFile) = 
     let fileName = 
-        Path.Combine
-            (Path.GetDirectoryName projectFile.FileName, projectFile.GetOutputDirectory buildConfig buildPlatform, 
-             projectFile.GetAssemblyName()) |> normalizePath
+        FileInfo(
+            Path.Combine
+                (Path.GetDirectoryName projectFile.FileName, projectFile.GetOutputDirectory buildConfig buildPlatform, 
+                 projectFile.GetAssemblyName()) 
+            |> normalizePath)
 
-    traceVerbose <| sprintf "Loading assembly metadata for %s" fileName
-    let bytes = File.ReadAllBytes fileName
-    let assembly = Assembly.Load bytes
+    traceVerbose <| sprintf "Loading assembly metadata for %s" fileName.FullName
+    let assemblyReader = 
+        ProviderImplementation.AssemblyReader.ILModuleReaderAfterReadingAllBytes(
+            fileName.FullName, 
+            ProviderImplementation.AssemblyReader.mkILGlobals ProviderImplementation.AssemblyReader.ecmaMscorlibScopeRef, 
+            true)
+
+    let versionFromAssembly = assemblyReader.ILModuleDef.ManifestOfAssembly.Version
+    let id = assemblyReader.ILModuleDef.ManifestOfAssembly.Name
+    assemblyReader,id,versionFromAssembly,fileName.FullName
 
-    assembly,assembly.GetName().Name,fileName
+let loadAssemblyAttributes (assemblyReader:ProviderImplementation.AssemblyReader.CacheValue) = 
+
+    let extractAttr (inp: ProviderImplementation.AssemblyReader.ILCustomAttr) = 
+         let args = ProviderImplementation.AssemblyReader.decodeILCustomAttribData assemblyReader.ILGlobals inp
+
+         inp.Method.EnclosingType.BasicQualifiedName, Seq.head [ for (_,arg) in args -> arg.ToString() ]
+
+    [| for a in assemblyReader.ILModuleDef.ManifestOfAssembly.CustomAttrs.Elements do 
+        yield extractAttr a |]
 
-let loadAssemblyAttributes fileName (assembly:Assembly) = 
-    try
-        assembly.GetCustomAttributesData()
-    with
-    | :? FileNotFoundException -> 
-        // retrieving via path
-        let assembly = Assembly.LoadFrom fileName
-        assembly.GetCustomAttributesData()
-    | exn ->
-        traceWarnfn "Loading custom attributes failed for %s.%sMessage: %s" fileName Environment.NewLine exn.Message
-        assembly.GetCustomAttributesData()
 
 let (|Valid|Invalid|) md = 
     match md with

diff --git a/src/Paket.Core/PackageProcess.fs b/src/Paket.Core/PackageProcess.fs
@@ -18,8 +18,8 @@ let private merge buildConfig buildPlatform version projectFile templateFile =
 
     match withVersion with
     | { Contents = ProjectInfo(md, opt) } -> 
-        let assembly,id,assemblyFileName = loadAssemblyId buildConfig buildPlatform projectFile
-        let attribs = loadAssemblyAttributes assemblyFileName assembly
+        let assemblyReader,id,versionFromAssembly,assemblyFileName = readAssembly buildConfig buildPlatform projectFile
+        let attribs = loadAssemblyAttributes assemblyReader
 
         let mergedOpt =
             match opt.Title with
@@ -37,7 +37,7 @@ let private merge buildConfig buildPlatform version projectFile templateFile =
 
                 let merged = 
                     { Id = md.Id
-                      Version = md.Version ++ getVersion assembly attribs
+                      Version = md.Version ++ getVersion version attribs
                       Authors = md.Authors ++ getAuthors attribs
                       Description = md.Description ++ getDescription attribs
                       Symbols = md.Symbols }

diff --git a/src/Paket.Core/Paket.Core.fsproj b/src/Paket.Core/Paket.Core.fsproj
@@ -74,6 +74,10 @@
   -->
   <Import Project="$(SolutionDir)\.paket\paket.targets" />
   <ItemGroup>
+    <Compile Include="..\..\paket-files\fsharp\FSharp.Data\src\CommonProviderImplementation\AssemblyReader.fs">
+      <Paket>True</Paket>
+      <Link>AssemblyReader.fs</Link>
+    </Compile>
     <Compile Include="..\..\paket-files\fsharp\FAKE\src\app\FakeLib\Globbing\Globbing.fs">
       <Paket>True</Paket>
       <Link>Globbing.fs</Link>

diff --git a/src/Paket.Core/paket.references b/src/Paket.Core/paket.references
@@ -1,4 +1,5 @@
 Newtonsoft.Json
 FSharp.Core
 Chessie
-File:Globbing.fs .
+File:Globbing.fs .
+File:AssemblyReader.fs .
diff --git a/src/Paket/App.config b/src/Paket/App.config
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <runtime>
-
-  <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+  </startup>
+<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
   <dependentAssembly>
     <Paket>True</Paket>
     <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -13,8 +15,4 @@
     <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
     <bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="7.0.0.0" />
   </dependentAssembly>
-</assemblyBinding></runtime>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-  </startup>
-</configuration>
+</assemblyBinding></runtime></configuration>
diff --git a/tests/Paket.Tests/App.config b/tests/Paket.Tests/App.config
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <runtime>
-
-  <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+
+<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
   <dependentAssembly>
     <Paket>True</Paket>
     <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -13,5 +12,4 @@
     <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
     <bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="7.0.0.0" />
   </dependentAssembly>
-</assemblyBinding></runtime>
-</configuration>
+</assemblyBinding></runtime></configuration>
diff --git a/tests/Paket.Tests/PackageProcessSpecs.fs b/tests/Paket.Tests/PackageProcessSpecs.fs
@@ -6,28 +6,6 @@ open Paket
 open FsUnit
 open NUnit.Framework
 
-let assembly = Assembly.GetExecutingAssembly()
-
-[<Test>]
-let ``Loading description from assembly works``() = 
-    let sut = PackageMetaData.getDescription (assembly.GetCustomAttributesData()) 
-    sut.Value |> shouldEqual "A description"
-
-[<Test>]
-let ``Loading version from assembly works``() = 
-    let sut = PackageMetaData.getVersion assembly (assembly.GetCustomAttributesData()) 
-    sut.Value |> shouldEqual (SemVer.Parse "1.0.0.0")
-
-[<Test>]
-let ``Loading authors from assembly works with GetCustomAttributesData``() = 
-    let sut = PackageMetaData.getAuthors (assembly.GetCustomAttributesData())
-    sut.Value |> shouldEqual [ "Two"; "Authors" ]
-
-[<Test>]
-let ``Loading id from assembly works``() = 
-    let sut = PackageMetaData.getId assembly ProjectCoreInfo.Empty
-    sut.Id.Value |> shouldEqual "Paket.Tests"
-
 [<Test>]
 let ``Loading assembly metadata works``() = 
     let workingDir = Path.GetFullPath(".")
@@ -48,11 +26,11 @@ let ``Loading assembly metadata works``() =
         if workingDir.Contains "Debug" then "Debug"
         else "Release"
 
-    let assembly,id,fileName = PackageMetaData.loadAssemblyId config "" projFile
+    let assemblyReader,id,versionFromAssembly,fileName = PackageMetaData.readAssembly config "" projFile
     id |> shouldEqual "Paket.Tests"
 
-    let attribs = PackageMetaData.loadAssemblyAttributes fileName assembly
-    PackageMetaData.getVersion assembly attribs |> shouldEqual <| Some(SemVer.Parse "1.0.0.0")
+    let attribs = PackageMetaData.loadAssemblyAttributes assemblyReader
+    PackageMetaData.getVersion versionFromAssembly attribs |> shouldEqual <| Some(SemVer.Parse "1.0.0.0")
     let authors = PackageMetaData.getAuthors attribs
     authors.Value |> shouldEqual ["Two"; "Authors" ]
     PackageMetaData.getDescription attribs |> shouldEqual <| Some("A description")